From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 13 Oct 2007 15:47:49 +0000 (+0200)
Subject: ide-pmac: remove nIEN clearing from pmac_ide_do_setfeature()
X-Git-Tag: v2.6.24-rc1~1363^2~16
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b2d0093b8eb2b0b4adc86138edee9f6d376cafb;p=linux-2.6

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>
---

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 13e26642da..c68e247234 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)
 	result = __ide_wait_stat(drive, drive->ready_stat,
 				 BUSY_STAT|DRQ_STAT|ERR_STAT,
 				 WAIT_CMD, &stat);
-	hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
 	if (result)
 		printk(KERN_ERR "%s: pmac_ide_do_setfeature disk not ready "
 			"after SET_FEATURE !\n", drive->name);