aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-07 09:37:06 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-07 09:37:06 -0400
commitf9952beeaa851f7f79a4dd895bfed3f3ff6deebc (patch)
treed1ab68325300fb7bc6fbfb86c09cb3e76d5814e9
parentdff8817b78e6e6a4913f2caf7637d62dcc49a03c (diff)
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>
-rw-r--r--drivers/ide/ide-iops.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 06fe002116ec..8dff623f9da3 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -311,7 +311,6 @@ int ide_driveid_update(ide_drive_t *drive)
311 311
312 return 1; 312 return 1;
313out_err: 313out_err:
314 SELECT_MASK(drive, 0);
315 if (rc == 2) 314 if (rc == 2)
316 printk(KERN_ERR "%s: %s: bad status\n", drive->name, __func__); 315 printk(KERN_ERR "%s: %s: bad status\n", drive->name, __func__);
317 kfree(id); 316 kfree(id);