Skip to content

Commit

Permalink
ide: remove superfluous SELECT_MASK() call from ide_driveid_update()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jun 7, 2009
1 parent dff8817 commit f9952be
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/ide/ide-iops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f9952be

Please sign in to comment.