[media] dvb_usb_v2: init I2C and USB mutex earlier

Those must be initialized earlier as we now pass
(struct dvb_usb_device *) to the firmware download
callbacks too.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index e1a3ed65cfb2ab64fa7436a152cb522691cf054f..1441324a911566451123ee2218e035b7dcc2521f 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/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);