From a05035bfd7d3ce7378696f0f20a593f5bee86ce1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 26 May 2011 05:52:01 -0300 Subject: [PATCH] --- yaml --- r: 261210 b: refs/heads/master c: 0528f354cfb98d8df32a76302ec07af1aa29dbd4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/rc-main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81a48d2eb69e..619ddcc265d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec05a642140c7c34f7ba1cb8a94be9b1154286ae +refs/heads/master: 0528f354cfb98d8df32a76302ec07af1aa29dbd4 diff --git a/trunk/drivers/media/rc/rc-main.c b/trunk/drivers/media/rc/rc-main.c index 3186ac7c2c10..30634ab5c226 100644 --- a/trunk/drivers/media/rc/rc-main.c +++ b/trunk/drivers/media/rc/rc-main.c @@ -1099,7 +1099,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); @@ -1107,6 +1106,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",