From a2b648b6abd332b39d6daea53730cf7179d417ba Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 10 May 2012 11:41:49 -0700
Subject: [PATCH] --- yaml --- r: 303882 b: refs/heads/master c:
 56d95f3174450d22a3b8d936bea2cb414262ce8f h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/ci13xxx_pci.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e708d22ac95a..b831c9a090ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f639554b8a3a4aac18193a0c98a4639d432c48f0
+refs/heads/master: 56d95f3174450d22a3b8d936bea2cb414262ce8f
diff --git a/trunk/drivers/usb/gadget/ci13xxx_pci.c b/trunk/drivers/usb/gadget/ci13xxx_pci.c
index ea03fabd4d97..c76844110e36 100644
--- a/trunk/drivers/usb/gadget/ci13xxx_pci.c
+++ b/trunk/drivers/usb/gadget/ci13xxx_pci.c
@@ -51,9 +51,6 @@ static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,
 	struct resource res[3];
 	int retval = 0, nres = 2;
 
-	if (id == NULL)
-		return -EINVAL;
-
 	retval = pci_enable_device(pdev);
 	if (retval)
 		goto done;