From a9834b12f239a7a6e418248942d48b3259705320 Mon Sep 17 00:00:00 2001
From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Date: Fri, 11 May 2012 17:25:40 +0300
Subject: [PATCH] --- yaml --- r: 303903 b: refs/heads/master c:
 1989b5ceb5aa57862ed770368ae90bf44fd13198 h: refs/heads/master i:   303901:
 103bec39b996332f61c8f919b08720b0572e02b8   303899:
 fa43bb77e78a8fe60319384a1842c613e11bea44   303895:
 1da8a738d9b9aea2308222929f57469f9f3550ef   303887:
 c675aee017d59a8fdfa4ec088f04ea107f9b4829   303871:
 b70ed04012198cddc7d8eda33b99570c9215a21f v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/ci13xxx_pci.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3c54745791e4..e9d7ccd31227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6286d85e8efdb59252d1ceb99a56fa6b0b11526c
+refs/heads/master: 1989b5ceb5aa57862ed770368ae90bf44fd13198
diff --git a/trunk/drivers/usb/gadget/ci13xxx_pci.c b/trunk/drivers/usb/gadget/ci13xxx_pci.c
index c76844110e36..f075ef33834f 100644
--- a/trunk/drivers/usb/gadget/ci13xxx_pci.c
+++ b/trunk/drivers/usb/gadget/ci13xxx_pci.c
@@ -51,6 +51,11 @@ static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,
 	struct resource res[3];
 	int retval = 0, nres = 2;
 
+	if (!driver) {
+		dev_err(&pdev->dev, "device doesn't provide driver data\n");
+		return -ENODEV;
+	}
+
 	retval = pci_enable_device(pdev);
 	if (retval)
 		goto done;