From 2468e7f9cd46090ad20f85e856c4d5030ba9bf66 Mon Sep 17 00:00:00 2001
From: Daniel J Blueman <daniel.blueman@gmail.com>
Date: Mon, 2 Jun 2008 20:05:14 -0300
Subject: [PATCH] --- yaml --- r: 118712 b: refs/heads/master c:
 8268c8f54505e5b952d1705a7bf3b2a218ed26bf h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d3910955e76e..06d0cf21f170 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c34158f206dca89c717e6818d04b8db187155a3
+refs/heads/master: 8268c8f54505e5b952d1705a7bf3b2a218ed26bf
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 5cef12a07f72..6fe71c6745eb 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/trunk/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;