scsi: sun_esp: fix device reference leaks

commit f62f9ffdb5ef683ef8cffb43932fa72cc3713e94 upstream.

Make sure to drop the reference to the dma device taken by
of_find_device_by_node() on probe errors and on driver unbind.

Fixes: 334ae614772b ("sparc: Kill SBUS DVMA layer.")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 676fe9ac7f61267bf156f7235aaa94e3c29af0a0..06b30f0449ab2205cc1ca787686a51b037193188 100644 (file)
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -568,6 +568,7 @@ static int __devinit esp_sbus_probe(struct platform_device *op)
        struct device_node *dp = op->dev.of_node;
        struct platform_device *dma_of = NULL;
        int hme = 0;
+       int ret;
 
        if (dp->parent &&
            (!strcmp(dp->parent->name, "espdma") ||
@@ -582,7 +583,11 @@ static int __devinit esp_sbus_probe(struct platform_device *op)
        if (!dma_of)
                return -ENODEV;
 
-       return esp_sbus_probe_one(op, dma_of, hme);
+       ret = esp_sbus_probe_one(op, dma_of, hme);
+       if (ret)
+               put_device(&dma_of->dev);
+
+       return ret;
 }
 
 static int __devexit esp_sbus_remove(struct platform_device *op)
@@ -615,6 +620,8 @@ static int __devexit esp_sbus_remove(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, NULL);
 
+       put_device(&dma_of->dev);
+
        return 0;
 }