ide-cd: fix register loading order in cdrom_start_packet_command()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages Oct 30, 2007 – Nov 9, 2007 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-10-30 23:50 UTC #0 lore raw

PATCH 8/15 ide-cd: fix register loading order in cdrom_start_packet_command()

Load IDE_CONTROL_REG before other registers in cdrom_start_packet_command().

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

While at it move misplaced FIXME comment in the right place.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/ide-cd.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/ide/ide-cd.c +3 -3

Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -917,19 +917,19 @@ static ide_startstop_t cdrom_start_packe
 	if (ide_wait_stat(&startstop, drive, 0, BUSY_STAT, WAIT_READY))
 		return startstop;
 
+	/* FIXME: for Virtual DMA we must check harder */
 	if (info->dma)
 		info->dma = !hwif->dma_setup(drive);
 
 	/* Set up the controller registers. */
-	/* FIXME: for Virtual DMA we must check harder */
+	if (IDE_CONTROL_REG)
+		HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
 	HWIF(drive)->OUTB(info->dma, IDE_FEATURE_REG);
 	HWIF(drive)->OUTB(0, IDE_IREASON_REG);
 	HWIF(drive)->OUTB(0, IDE_SECTOR_REG);
 
 	HWIF(drive)->OUTB(xferlen & 0xff, IDE_BCOUNTL_REG);
 	HWIF(drive)->OUTB(xferlen >> 8  , IDE_BCOUNTH_REG);
-	if (IDE_CONTROL_REG)
-		HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
  
 	if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {
 		/* waiting for CDB interrupt, not DMA yet. */

Sergei Shtylyov

Acked-by on v1 8/15

2007-11-04 15:44 UTC #1 lore raw

Quoted 8 lines · Bartlomiej Zolnierkiewicz

Load IDE_CONTROL_REG before other registers in cdrom_start_packet_command().
It shouldn't affect anything (just a usual paranoia to separate changes which change the way in which hardware is accessed from code cleanups).
While at it move misplaced FIXME comment in the right place.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

Acked-by Sergei Shtylyov <[email protected]>

MBR, Sergei