diff --git a/[refs] b/[refs] index 2b99c21d451a..c19d11ae6ad8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46f85978687152c53a69fc06951e386f194e7f5d +refs/heads/master: b0efc3ed0530b08e9e1cba5f63e9c251ca3d7428 diff --git a/trunk/drivers/media/usb/dvb-usb/m920x.c b/trunk/drivers/media/usb/dvb-usb/m920x.c index 79b31ae66a9c..c2b635d6a17a 100644 --- a/trunk/drivers/media/usb/dvb-usb/m920x.c +++ b/trunk/drivers/media/usb/dvb-usb/m920x.c @@ -76,12 +76,12 @@ static inline int m920x_write_seq(struct usb_device *udev, u8 request, seq++; } while (seq->address); - return ret; + return 0; } static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq) { - int ret = 0, i, epi, flags = 0; + int ret, i, epi, flags = 0; int adap_enabled[M9206_MAX_ADAPTERS] = { 0 }; /* Remote controller init. */ @@ -124,7 +124,7 @@ static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq) } } - return ret; + return 0; } static int m920x_init_ep(struct usb_interface *intf)