Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ec86a30 authored by Davide Ciminaghi's avatar Davide Ciminaghi Committed by Samuel Ortiz
Browse files

mfd: sta2x11-mfd: Only add sta2x11_mfd if it hasn't already been added 



The pci probe method is called twice now, so we have to call
sta2x11_mfd_add() only once to avoid a -EBUSY error.

Signed-off-by: default avatarDavide Ciminaghi <ciminaghi@gnudd.com>
Acked-by: default avatarAlessandro Rubini <rubini@gnudd.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b18adafc

drivers/mfd/sta2x11-mfd.c

+2 −1
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ 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 */

	if (!sta2x11_mfd_find(pdev))

		sta2x11_mfd_add(pdev, GFP_ATOMIC);



	/* Just 2 bars for all mfd's at present */