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>

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 7a987a7..94dd240 100644 (file)
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -297,8 +297,11 @@ static int bcma_device_probe(struct device *dev)
                                               drv);
        int err = 0;
 
                                               drv);
        int err = 0;
 

+       get_device(dev);

        if (adrv->probe)
                err = adrv->probe(core);
        if (adrv->probe)
                err = adrv->probe(core);

+       if (err)
+               put_device(dev);

 
        return err;
 }
 
        return err;
 }


@@ -311,6 +314,7 @@ static int bcma_device_remove(struct device *dev)
 
        if (adrv->remove)
                adrv->remove(core);
 
        if (adrv->remove)
                adrv->remove(core);

+       put_device(dev);

 
        return 0;
 }
 
        return 0;
 }