Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scsi: sun_esp: fix device reference leaks

Browse source 
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: 334ae61477 ("sparc: Kill SBUS DVMA layer.")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Johan Hovold 2017-06-21 11:35:09 +02:00 • committed by Martin K. Petersen
parent 4a1108d6ca
commit f62f9ffdb5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/sun_esp.c
View file

@ -566,6 +566,7 @@ static int esp_sbus_probe(struct platform_device *op)
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct platform_device *dma_of = NULL; struct platform_device *dma_of = NULL;
int hme = 0; int hme = 0;
int ret;
if (dp->parent && if (dp->parent &&
(!strcmp(dp->parent->name, "espdma") || (!strcmp(dp->parent->name, "espdma") ||
@ -580,7 +581,11 @@ static int esp_sbus_probe(struct platform_device *op)
if (!dma_of) if (!dma_of)
return -ENODEV; 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) 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); dev_set_drvdata(&op->dev, NULL);
put_device(&dma_of->dev);
return 0; return 0;
} }