Commit f9952bee authored Jun 07, 2009 by Bartlomiej Zolnierkiewicz

ide: remove superfluous SELECT_MASK() call from ide_driveid_update()



We always call SELECT_MASK(drive, 0) after ide_dev_read_id() call
so there is no need to do it again in the error path.

Moreover with the combination of HPT36x controller and the drive on
the quirk_drives[] list this can result in superfluous enable_irq()
call which in turn will trigger WARN() in __enable_irq().

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent dff8817b

drivers/ide/ide-iops.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -311,7 +311,6 @@ int ide_driveid_update(ide_drive_t *drive)

		return 1;
		out_err:
		SELECT_MASK(drive, 0);
		if (rc == 2)
		printk(KERN_ERR "%s: %s: bad status\n", drive->name, __func__);
		kfree(id);

Admin message