summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-01-28 14:31:22 +0100
committerBen Hutchings <ben@decadent.org.uk>2017-06-05 21:17:01 +0100
commitaecda4433fc07188722ed9c82da59b1dc7b473e6 (patch)
treee49cddd7505faf92f4f4fb51dd45ed7047a0609c /drivers
parentfbd638f72b48bb92fa472578bfc9c47e94d4bd64 (diff)
downloadlinux-stable-aecda4433fc07188722ed9c82da59b1dc7b473e6.tar.gz
linux-stable-aecda4433fc07188722ed9c82da59b1dc7b473e6.tar.bz2
linux-stable-aecda4433fc07188722ed9c82da59b1dc7b473e6.zip
bcma: use (get|put)_device when probing/removing device driver
commit a971df0b9d04674e325346c17de9a895425ca5e1 upstream. This allows tracking device state and e.g. makes devm work as expected. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bcma/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 34ea4c588d36..f371019925a2 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -450,8 +450,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;
}
@@ -464,6 +467,7 @@ static int bcma_device_remove(struct device *dev)
if (adrv->remove)
adrv->remove(core);
+ put_device(dev);
return 0;
}