Skip to content

Commit

Permalink
[media] dvb_usb_v2: init I2C and USB mutex earlier
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent 005bc3f commit 19b308c
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/media/dvb/dvb-usb/dvb_usb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 19b308c

Please sign in to comment.