From 71c2145082a5604357a11784113ee7ed0c7b72fe Mon Sep 17 00:00:00 2001 From: Davide Ciminaghi Date: Fri, 9 Nov 2012 15:19:56 +0100 Subject: [PATCH] --- yaml --- r: 344991 b: refs/heads/master c: 8ec86a302a190bc4864928dd69f3f22066137b68 h: refs/heads/master i: 344989: 471005409234a6865fc4b1a3dad446cd6fe71a67 344987: 6221f8d2059963ae5dd0c720637b130588b1b306 344983: 0dc4080af662de9ce44794ff1485dcd9b4837b30 344975: 6c308d6708f84a2c8b9e98ee392e38c6565b4baf 344959: 800b5bb8041493ac3a58baeb711b5846cce737d8 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/sta2x11-mfd.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c75535801f97..444aaa28d0d9 100644 --- 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 index 8d38ef264722..b981dc4a7b3c 100644 --- 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++) {