Commit 8844f0aa authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files

ata: pata_parport: Fix ida_alloc return value error check 



pi->dev.id is unsigned so error checking of ida_alloc return value does
not work. Fix it.

Signed-off-by: default avatarOndrej Zary <linux@zary.sk>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 72f2b0b2

drivers/ata/pata_parport/pata_parport.c

+4 −2
Original line number Diff line number Diff line
@@ -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);