aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ppc
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-13 11:47:49 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-13 11:47:49 -0400
commit3b2d0093b8eb2b0b4adc86138edee9f6d376cafb (patch)
tree0fb45264c2bcb3a931f86335e71a0ff8b654ba7c /drivers/ide/ppc
parentddf151026a293725507fedc39b18ae6edb86d775 (diff)
ide-pmac: remove nIEN clearing from pmac_ide_do_setfeature()
Upper layers are responsible for controlling nIEN so don't clear nIEN after command execution in pmac_ide_do_setfeature(). Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r--drivers/ide/ppc/pmac.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 13e26642dad7..c68e2472345a 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -556,7 +556,6 @@ pmac_ide_do_setfeature(ide_drive_t *drive, u8 command)
556 result = __ide_wait_stat(drive, drive->ready_stat, 556 result = __ide_wait_stat(drive, drive->ready_stat,
557 BUSY_STAT|DRQ_STAT|ERR_STAT, 557 BUSY_STAT|DRQ_STAT|ERR_STAT,
558 WAIT_CMD, &stat); 558 WAIT_CMD, &stat);
559 hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
560 if (result) 559 if (result)
561 printk(KERN_ERR "%s: pmac_ide_do_setfeature disk not ready " 560 printk(KERN_ERR "%s: pmac_ide_do_setfeature disk not ready "
562 "after SET_FEATURE !\n", drive->name); 561 "after SET_FEATURE !\n", drive->name);