diff mbox

rc: double unlock in rc_register_device()

Message ID 20110526085201.GF14591@shale.localdomain (mailing list archive)
State Superseded, archived
Headers

Commit Message

Dan Carpenter May 26, 2011, 8:52 a.m. UTC 
  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.

Signed-off-by: Dan Carpenter <error27@gmail.com>
---
Compile tested only.

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Jarod Wilson May 26, 2011, 2:49 p.m. UTC | #1 
Dan Carpenter wrote:
> If change_protocol() fails and we goto out_raw, then it calls unlock
> twice.

Gah, good catch, I gotta quit adding new bugs... ;)


> I noticed that the other time we called change_protocol() we
> held the &dev->lock, so I changed it to hold it here too.
>
> Signed-off-by: Dan Carpenter<error27@gmail.com>
> ---
> Compile tested only.


I've sanity-checked the code, and yeah, calling change_protocol() 
function pointers with the lock held should be perfectly fine here too. 
The change_protocol functions are device-driver-specific, and don't 
touch the core rc device lock.

Reviewed-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
diff mbox

Patch

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index f57cd56..136a6c6 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1097,7 +1097,6 @@  int rc_register_device(struct rc_dev *dev)
 		if (rc < 0)
 			goto out_input;
 	}
-	mutex_unlock(&dev->lock);
 
 	if (dev->change_protocol) {
 		rc = dev->change_protocol(dev, rc_map->rc_type);
@@ -1105,6 +1104,8 @@  int rc_register_device(struct rc_dev *dev)
 			goto out_raw;
 	}
 
+	mutex_unlock(&dev->lock);
+
 	IR_dprintk(1, "Registered rc%ld (driver: %s, remote: %s, mode %s)\n",
 		   dev->devno,
 		   dev->driver_name ? dev->driver_name : "unknown",