ata: pata_parport: Fix ida_alloc return value error check
authorOndrej Zary <linux@zary.sk>
Sat, 4 Feb 2023 20:55:27 +0000 (21:55 +0100)
committerDamien Le Moal <damien.lemoal@opensource.wdc.com>
Mon, 6 Feb 2023 23:59:35 +0000 (08:59 +0900)
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>
drivers/ata/pata_parport/pata_parport.c

index 9e8ad93d7e591c4e35515be90bd0839e189d3ae3..294a266a0dda579c58475678ade746f2e2c723ff 100644 (file)
@@ -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
@@ -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);