---

yaml --- r: 330572 b: refs/heads/master c: 19b308c h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 3fe29ff · 3fe29ff
1 parent ed44448
commit 3fe29ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 005bc3fce76b3bd7c0a583cf3e89ce11c87077cd
+refs/heads/master: 19b308c035b4d65cc32a67d9e020377e6bf9c852
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -182,9 +182,6 @@ static int dvb_usb_init(struct dvb_usb_device *d)
 {
 	int ret = 0;
 
-	mutex_init(&d->usb_mutex);
-	mutex_init(&d->i2c_mutex);
-
 	d->state = DVB_USB_STATE_INIT;
 
 	/* check the capabilities and set appropriate variables */
@@ -261,6 +258,8 @@ int dvb_usbv2_device_init(struct usb_interface *intf,
 	d->name = driver_info->name;
 	d->rc_map = driver_info->rc_map;
 	memcpy(&d->props, props, sizeof(struct dvb_usb_device_properties));
+	mutex_init(&d->usb_mutex);
+	mutex_init(&d->i2c_mutex);
 
 	if (d->props.size_of_priv > 0) {
 		d->priv = kzalloc(d->props.size_of_priv, GFP_KERNEL);