aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 02:13:12 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 02:13:12 +0200
commit328aa7a45af61bc0060c80847daa67fef7b9c0d0 (patch)
tree881a740801a9615e806ef7bf3830253a47f487a3 /drivers/media
parent5864eaf2f7f0ec3366be0efe9e7a5fd0476e25cc (diff)
downloadkernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.zip
kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.tar.gz
kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.tar.bz2
merged more from 3.0.101 that is not related to the platform
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/rc-main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 05c096a..62910ac 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1129,8 +1129,7 @@ out_table:
out_dev:
device_del(&dev->dev);
out_unlock:
- if (mutex_is_locked(&dev->lock))
- mutex_unlock(&dev->lock);
+ mutex_unlock(&dev->lock);
return rc;
}
EXPORT_SYMBOL_GPL(rc_register_device);