From a15c331577e8b4a021870637daf9a43248b6f609 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 23 Dec 2011 13:39:34 -0300
Subject: [PATCH] --- yaml --- r: 285719 b: refs/heads/master c:
 eabd0eaf4f390df102cd24a87300b0e5150cf189 h: refs/heads/master i:   285717:
 ad3fa3e632e2099cfb209858fe5f9e79445aac3d   285715:
 c89f116aef94e6aa685d1d261081f0eb67a286bf   285711:
 916d9187adfd82a3cbc5f46e1cea976df9e08665 v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/staging/media/as102/as102_usb_drv.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 77ed73c184dd..526b218288ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e5ac7ea57ea56628f73a8a0aaf58f758aae43a
+refs/heads/master: eabd0eaf4f390df102cd24a87300b0e5150cf189
diff --git a/trunk/drivers/staging/media/as102/as102_usb_drv.c b/trunk/drivers/staging/media/as102/as102_usb_drv.c
index 7bcb28cdbabe..d775be0173ea 100644
--- a/trunk/drivers/staging/media/as102/as102_usb_drv.c
+++ b/trunk/drivers/staging/media/as102/as102_usb_drv.c
@@ -353,12 +353,6 @@ static int as102_usb_probe(struct usb_interface *intf,
 
 	ENTER();
 
-	as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
-	if (as102_dev == NULL) {
-		err("%s: kzalloc failed", __func__);
-		return -ENOMEM;
-	}
-
 	/* This should never actually happen */
 	if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) !=
 	    (sizeof(as102_device_names) / sizeof(const char *))) {
@@ -366,6 +360,12 @@ static int as102_usb_probe(struct usb_interface *intf,
 		return -EINVAL;
 	}
 
+	as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
+	if (as102_dev == NULL) {
+		err("%s: kzalloc failed", __func__);
+		return -ENOMEM;
+	}
+
 	/* Assign the user-friendly device name */
 	for (i = 0; i < (sizeof(as102_usb_id_table) /
 			 sizeof(struct usb_device_id)); i++) {