lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] rc: double unlock in rc_register_device()

Browse Source 
If change_protocol() fails and we goto out_raw, then it calls unlock
twice.  I noticed that the other time we called change_protocol() we
held the &dev->lock, so I changed it to hold it here too.

Reviewed-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Dan Carpenter
2011-05-26 05:52:01 -03:00
committed by Mauro Carvalho Chehab
parent ec05a64214
commit 0528f354cf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/rc/rc-main.c
View File

@@ -1099,7 +1099,6 @@ int rc_register_device(struct rc_dev *dev)
if (rc < 0) if (rc < 0)
goto out_input; goto out_input;
} }
mutex_unlock(&dev->lock);
if (dev->change_protocol) { if (dev->change_protocol) {
rc = dev->change_protocol(dev, rc_map->rc_type); rc = dev->change_protocol(dev, rc_map->rc_type);
@@ -1107,6 +1106,8 @@ int rc_register_device(struct rc_dev *dev)
goto out_raw; goto out_raw;
} }
mutex_unlock(&dev->lock);
IR_dprintk(1, "Registered rc%ld (driver: %s, remote: %s, mode %s)\n", IR_dprintk(1, "Registered rc%ld (driver: %s, remote: %s, mode %s)\n",
dev->devno, dev->devno,
dev->driver_name ? dev->driver_name : "unknown", dev->driver_name ? dev->driver_name : "unknown",