aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby2013-03-03 16:09:07 -0600
committerGreg Kroah-Hartman2013-03-03 16:09:07 -0600
commit55bce39db26a3b1d6b18fc0ae5d57948946f0c49 (patch)
tree649d35957d50f32031d03a595b270a025b77b089
parentcc0e3e13b0a90e5ff42d5b134939eacf5e7e497c (diff)
downloadkernel-common-55bce39db26a3b1d6b18fc0ae5d57948946f0c49.tar.gz
kernel-common-55bce39db26a3b1d6b18fc0ae5d57948946f0c49.tar.xz
kernel-common-55bce39db26a3b1d6b18fc0ae5d57948946f0c49.zip
dca: check against empty dca_domains list before unregister provider fix
In 3.0.67, commit 7a9a20ea77e7508c795dead9ab2f6c98a617762d (dca: check against empty dca_domains list before unregister provider), upstream commit c419fcfd071cf34ba00f9f65282583772d2655e7, added a fail path to unregister_dca_provider. It added there also a call to raw_spin_unlock_irqrestore. But in 3.0, the lock is not raw, so this results in: drivers/dca/dca-core.c: In function 'unregister_dca_provider': drivers/dca/dca-core.c:413: warning: passing argument 1 of '_raw_spin_unlock_irqrestore' from incompatible pointer type Fix it by calling spin_unlock_irqrestore properly. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/dca/dca-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
index 7065851d0b7..605fd20b1e5 100644
--- a/drivers/dca/dca-core.c
+++ b/drivers/dca/dca-core.c
@@ -410,7 +410,7 @@ void unregister_dca_provider(struct dca_provider *dca, struct device *dev)
410 spin_lock_irqsave(&dca_lock, flags); 410 spin_lock_irqsave(&dca_lock, flags);
411 411
412 if (list_empty(&dca_domains)) { 412 if (list_empty(&dca_domains)) {
413 raw_spin_unlock_irqrestore(&dca_lock, flags); 413 spin_unlock_irqrestore(&dca_lock, flags);
414 return; 414 return;
415 } 415 }
416 416