From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 10 May 2012 18:41:49 +0000 (-0700)
Subject: USB: gadget: ci13xx_pci: remove unneeded check in ci13xxx_pci_probe()
X-Git-Tag: v3.5-rc1~149^2~104
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56d95f3174450d22a3b8d936bea2cb414262ce8f;p=karo-tx-linux.git

USB: gadget: ci13xx_pci: remove unneeded check in ci13xxx_pci_probe()

As pointed out by Dan Carpenter, the check for NULL for the id variable
is no longer needed, especially as we just dereferenced it a few lines
earlier, causing an oops if it really was NULL.

This was caused by 62bb84ed0e4d: "usb: gadget: ci13xxx: convert to
platform device".

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/gadget/ci13xxx_pci.c b/drivers/usb/gadget/ci13xxx_pci.c
index ea03fabd4d97..c76844110e36 100644
--- a/drivers/usb/gadget/ci13xxx_pci.c
+++ b/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;