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;