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.

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

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index c7d77f0ad892d5ae82a1968e64d13b3374164dbd..855a23c1c81505f52e1cc17253e0d511fd6b368a 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -917,19 +917,19 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
        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. */