From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 25 Jan 2008 21:17:09 +0000 (+0100)
Subject: ide: fix registers loading order for WIN_SMART in execute_drive_cmd()
X-Git-Tag: v2.6.25-rc1~1236^2~48
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=46f26c362d5109459f04f99e93fc0413d88516c8;p=linux-2.6-omap-h63xx.git

ide: fix registers loading order for WIN_SMART in execute_drive_cmd()

Fix registers loading order for REQ_TYPE_ATA_CMD request with WIN_SMART
command in execute_drive_cmd() (load IDE_FEATURE_REG and IDE_SECTOR_REG
before loading IDE_LCYL_REG and IDE_HCYL_REG).

It shouldn't affect anything (just a usual paranoia to separate changes
which change the way in which hardware is accessed from code cleanups).

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

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 4ea8419feee..c616c9fb483 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -932,10 +932,10 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
  		printk("xx=0x%02x\n", args[3]);
 #endif
  		if (args[0] == WIN_SMART) {
- 			hwif->OUTB(0x4f, IDE_LCYL_REG);
- 			hwif->OUTB(0xc2, IDE_HCYL_REG);
  			hwif->OUTB(args[2],IDE_FEATURE_REG);
  			hwif->OUTB(args[1],IDE_SECTOR_REG);
+			hwif->OUTB(0x4f, IDE_LCYL_REG);
+			hwif->OUTB(0xc2, IDE_HCYL_REG);
  			ide_cmd(drive, args[0], args[3], &drive_cmd_intr);
  			return ide_started;
  		}