Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[sfrench/cifs-2.6.git] / drivers / media / dvb / dvb-usb / dvb-usb-urb.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 5cef12a07f72d8beae5757fe9b7596b7406721ad..6fe71c6745eb64c266db61147ef16f58128e7a41 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -13,14 +13,14 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
 {
        int actlen,ret = -ENOMEM;
 
+       if (!d || wbuf == NULL || wlen == 0)
+               return -EINVAL;
+
        if (d->props.generic_bulk_ctrl_endpoint == 0) {
                err("endpoint for generic control not specified.");
                return -EINVAL;
        }
 
-       if (wbuf == NULL || wlen == 0)
-               return -EINVAL;
-
        if ((ret = mutex_lock_interruptible(&d->usb_mutex)))
                return ret;