From 9111a9c17d085a279cb3b247bb029fcfe2737ad5 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Mon, 18 Jan 2010 07:20:35 +0000
Subject: [PATCH] --- yaml --- r: 185798 b: refs/heads/master c:
 3fccaa192b9501e79a57e02e62b6bf420d2b461e h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/ide/aec62xx.c       | 1 +
 trunk/drivers/ide/ide-xfer-mode.c | 2 ++
 trunk/include/linux/ide.h         | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b827dbafa077..e906d705eb69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2d4e780aff2fab46a792ebc89f80d1a6872b325
+refs/heads/master: 3fccaa192b9501e79a57e02e62b6bf420d2b461e
diff --git a/trunk/drivers/ide/aec62xx.c b/trunk/drivers/ide/aec62xx.c
index 878f8ec6dbe1..4c869872eb9a 100644
--- a/trunk/drivers/ide/aec62xx.c
+++ b/trunk/drivers/ide/aec62xx.c
@@ -136,6 +136,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
 
 static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
+	drive->dma_mode = pio + XFER_PIO_0;
 	drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);
 }
 
diff --git a/trunk/drivers/ide/ide-xfer-mode.c b/trunk/drivers/ide/ide-xfer-mode.c
index cdae463f6b41..c2323869d92a 100644
--- a/trunk/drivers/ide/ide-xfer-mode.c
+++ b/trunk/drivers/ide/ide-xfer-mode.c
@@ -167,9 +167,11 @@ int ide_set_dma_mode(ide_drive_t *drive, const u8 mode)
 	if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) {
 		if (ide_config_drive_speed(drive, mode))
 			return -1;
+		drive->dma_mode = mode;
 		port_ops->set_dma_mode(drive, mode);
 		return 0;
 	} else {
+		drive->dma_mode = mode;
 		port_ops->set_dma_mode(drive, mode);
 		return ide_config_drive_speed(drive, mode);
 	}
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index b5d2e9655059..746ef9fdabcb 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -516,6 +516,7 @@ struct ide_drive_s {
         u8	current_speed;	/* current transfer rate set */
 	u8	desired_speed;	/* desired transfer rate set */
 	u8	pio_mode;	/* for ->set_pio_mode _only_ */
+	u8	dma_mode;	/* for ->dma_pio_mode _only_ */
         u8	dn;		/* now wide spread use */
 	u8	acoustic;	/* acoustic management */
 	u8	media;		/* disk, cdrom, tape, floppy, ... */