---

yaml --- r: 344991 b: refs/heads/master c: 8ec86a3 h: refs/heads/master i: 344989: 4710054 344987: 6221f8d 344983: 0dc4080 344975: 6c308d6 344959: 800b5bb v: v3
git-mirror · Nov 20, 2012 · 71c2145 · 71c2145
1 parent 8d39bae
commit 71c2145
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b18adafccd497245a6bc5b867bf9cba7e01f8729
+refs/heads/master: 8ec86a302a190bc4864928dd69f3f22066137b68
diff --git a/trunk/drivers/mfd/sta2x11-mfd.c b/trunk/drivers/mfd/sta2x11-mfd.c
@@ -585,7 +585,8 @@ static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev,
 	sta2x11_mfd_setup(pdev, setup_data);
 
 	/* Record this pdev before mfd_add_devices: their probe looks for it */
-	sta2x11_mfd_add(pdev, GFP_ATOMIC);
+	if (!sta2x11_mfd_find(pdev))
+		sta2x11_mfd_add(pdev, GFP_ATOMIC);
 
 	/* Just 2 bars for all mfd's at present */
 	for (i = 0; i < 2; i++) {