Skip to content

Commit

Permalink
ata: pata_parport: Fix ida_alloc return value error check
Browse files Browse the repository at this point in the history
pi->dev.id is unsigned so error checking of ida_alloc return value does
not work. Fix it.

Signed-off-by: Ondrej Zary <linux@zary.sk>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
  • Loading branch information
Ondrej Zary authored and Damien Le Moal committed Feb 6, 2023
1 parent 72f2b0b commit 8844f0a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/ata/pata_parport/pata_parport.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
struct ata_host *host;
struct pi_adapter *pi;
struct pi_device_match match = { .parport = parport, .proto = pr };
int id;

/*
* Abort if there's a device already registered on the same parport
Expand All @@ -441,9 +442,10 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
pi->dev.bus = &pata_parport_bus_type;
pi->dev.driver = &pr->driver;
pi->dev.release = pata_parport_dev_release;
pi->dev.id = ida_alloc(&pata_parport_bus_dev_ids, GFP_KERNEL);
if (pi->dev.id < 0)
id = ida_alloc(&pata_parport_bus_dev_ids, GFP_KERNEL);
if (id < 0)
return NULL; /* pata_parport_dev_release will do kfree(pi) */
pi->dev.id = id;
dev_set_name(&pi->dev, "pata_parport.%u", pi->dev.id);
if (device_register(&pi->dev)) {
put_device(&pi->dev);
Expand Down

0 comments on commit 8844f0a

Please sign in to comment.