iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ata: pata_octeon_cf: fix error return code in octeon_cf_probe()

Browse Source 
The variable 'rv' is set to 0 after calling of_property_read_reg(), so
it cannot be used as an error code. Change to using correct error codes
in the error path.

Fixes: d0b2461678b1 ("ata: Use of_property_read_reg() to parse "reg"")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
This commit is contained in:
Yang Yingliang 2023-07-25 20:28:09 +08:00 committed by Damien Le Moal
parent 4139f992c4
commit 1cfe2d28e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ata/pata_octeon_cf.c
View File

@ -815,8 +815,8 @@ static int octeon_cf_probe(struct platform_device *pdev)
irq_handler_t irq_handler = NULL; irq_handler_t irq_handler = NULL;
void __iomem *base; void __iomem *base;
struct octeon_cf_port *cf_port; struct octeon_cf_port *cf_port;
int rv = -ENOMEM;
u32 bus_width; u32 bus_width;
int rv;
node = pdev->dev.of_node; node = pdev->dev.of_node;
if (node == NULL) if (node == NULL)
@ -893,12 +893,12 @@ static int octeon_cf_probe(struct platform_device *pdev)
cs0 = devm_ioremap(&pdev->dev, res_cs0->start, cs0 = devm_ioremap(&pdev->dev, res_cs0->start,
resource_size(res_cs0)); resource_size(res_cs0));
if (!cs0) if (!cs0)
return rv; return -ENOMEM;
/* allocate host */ /* allocate host */
host = ata_host_alloc(&pdev->dev, 1); host = ata_host_alloc(&pdev->dev, 1);
if (!host) if (!host)
return rv; return -ENOMEM;
ap = host->ports[0]; ap = host->ports[0];
ap->private_data = cf_port; ap->private_data = cf_port;