---

yaml --- r: 303865 b: refs/heads/master c: f9df839 h: refs/heads/master i: 303863: f52cb08 v: v3
git-mirror · May 8, 2012 · 4b3ef45 · 4b3ef45
1 parent 3938010
commit 4b3ef45
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 134 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d36ade60e3cc212992f001d2046815b068073c0c
+refs/heads/master: f9df8395c7f9b1b8d0ea9221595a97f2f4720359
diff --git a/trunk/drivers/usb/gadget/ci13xxx_msm.c b/trunk/drivers/usb/gadget/ci13xxx_msm.c
@@ -79,7 +79,8 @@ static int ci13xxx_msm_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	ret = udc_probe(&ci13xxx_msm_udc_driver, &pdev->dev, regs);
+	ret = udc_probe(&ci13xxx_msm_udc_driver, &pdev->dev, regs,
+			DEF_CAPOFFSET);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "udc_probe failed\n");
 		goto iounmap;

diff --git a/trunk/drivers/usb/gadget/ci13xxx_pci.c b/trunk/drivers/usb/gadget/ci13xxx_pci.c
@@ -55,6 +55,7 @@ static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,
 				       const struct pci_device_id *id)
 {
 	void __iomem *regs = NULL;
+	uintptr_t capoffset = DEF_CAPOFFSET;
 	int retval = 0;
 
 	if (id == NULL)
@@ -86,7 +87,11 @@ static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,
 	pci_set_master(pdev);
 	pci_try_set_mwi(pdev);
 
-	retval = udc_probe(&ci13xxx_pci_udc_driver, &pdev->dev, regs);
+	if (pdev->vendor == PCI_VENDOR_ID_INTEL)
+		capoffset = 0;
+
+	retval = udc_probe(&ci13xxx_pci_udc_driver, &pdev->dev, regs,
+			   capoffset);
 	if (retval)
 		goto iounmap;