---

yaml --- r: 185798 b: refs/heads/master c: 3fccaa1 h: refs/heads/master v: v3
git-mirror · Jan 19, 2010 · 9111a9c · 9111a9c
1 parent 39189e9
commit 9111a9c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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, ... */
-Original file line number
+Diff line change
@@ Expand Up @@
     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);
     }
@@ Expand Down @@