diff options
Diffstat (limited to 'drivers/media/rc/rc-main.c')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 3186ac7c2c1..51a23f48bc7 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -735,6 +735,7 @@ static struct {  	{ RC_TYPE_JVC,		"jvc"		},  	{ RC_TYPE_SONY,		"sony"		},  	{ RC_TYPE_RC5_SZ,	"rc-5-sz"	}, +	{ RC_TYPE_MCE_KBD,	"mce_kbd"	},  	{ RC_TYPE_LIRC,		"lirc"		},  	{ RC_TYPE_OTHER,	"other"		},  }; @@ -1099,7 +1100,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 +1107,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",  |