aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shishkin <alexander.shishkin@linux.intel.com>2012-05-11 10:25:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-11 19:35:38 -0400
commit1989b5ceb5aa57862ed770368ae90bf44fd13198 (patch)
tree80eeb42239d9d5520d2df7346adc8777e156732e
parent6286d85e8efdb59252d1ceb99a56fa6b0b11526c (diff)
usb: gadget: ci13xxx_pci: guard against devices without driver_data
Don't try to initialize devices that don't have driver_data assigned to their pci ids. Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/ci13xxx_pci.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/gadget/ci13xxx_pci.c b/drivers/usb/gadget/ci13xxx_pci.c
index c76844110e36..f075ef33834f 100644
--- a/drivers/usb/gadget/ci13xxx_pci.c
+++ b/drivers/usb/gadget/ci13xxx_pci.c
@@ -51,6 +51,11 @@ static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,
51 struct resource res[3]; 51 struct resource res[3];
52 int retval = 0, nres = 2; 52 int retval = 0, nres = 2;
53 53
54 if (!driver) {
55 dev_err(&pdev->dev, "device doesn't provide driver data\n");
56 return -ENODEV;
57 }
58
54 retval = pci_enable_device(pdev); 59 retval = pci_enable_device(pdev);
55 if (retval) 60 if (retval)
56 goto done; 61 goto done;