[PATCH 3.12 40/60] bcma: use (get|put)_device when probing/removing device driver

[Jiri Slaby]

From: RafaÅ MiÅecki <rafal@xxxxxxxxxx>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit a971df0b9d04674e325346c17de9a895425ca5e1 upstream.

This allows tracking device state and e.g. makes devm work as expected.

Signed-off-by: RafaÅ MiÅecki <rafal@xxxxxxxxxx>
Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
---
 drivers/bcma/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 90ee350442a9..04f4e89edce5 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -451,8 +451,11 @@ static int bcma_device_probe(struct device *dev)
 					       drv);
 	int err = 0;
 
+	get_device(dev);
 	if (adrv->probe)
 		err = adrv->probe(core);
+	if (err)
+		put_device(dev);
 
 	return err;
 }
@@ -465,6 +468,7 @@ static int bcma_device_remove(struct device *dev)
 
 	if (adrv->remove)
 		adrv->remove(core);
+	put_device(dev);
 
 	return 0;
 }
-- 
2.12.0