diff options
| author | Johan Hovold <johan@kernel.org> | 2017-06-21 11:35:09 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-06-27 21:46:55 -0400 |
| commit | f62f9ffdb5ef683ef8cffb43932fa72cc3713e94 (patch) | |
| tree | 9ca746b4ed8c552eeb2447428fd79fea040528bb /drivers/scsi | |
| parent | 4a1108d6caf7cd0f15d439bee6163ba00c7c1b33 (diff) | |
| download | blackbird-obmc-linux-f62f9ffdb5ef683ef8cffb43932fa72cc3713e94.tar.gz blackbird-obmc-linux-f62f9ffdb5ef683ef8cffb43932fa72cc3713e94.zip | |
scsi: sun_esp: fix device reference leaks
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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sun_esp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c index 7b6d4c2087d7..747ee64a78e1 100644 --- a/drivers/scsi/sun_esp.c +++ b/drivers/scsi/sun_esp.c @@ -566,6 +566,7 @@ static int 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") || @@ -580,7 +581,11 @@ static int 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 esp_sbus_remove(struct platform_device *op) @@ -613,6 +618,8 @@ static int esp_sbus_remove(struct platform_device *op) dev_set_drvdata(&op->dev, NULL); + put_device(&dma_of->dev); + return 0; } |
