ide-cd: fix DMA error handling in cdrom_newpc_intr()

Make cdrom_newpc_intr() match cdrom_{read,write}_intr() w.r.t.
handling DMA errors:

* disable DMA before cdrom_decode_status() call

* log the device name and the type of the request (read/write)

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

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index cbe4f1a04c14..c638d057f910 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1674,6 +1674,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         if (dma) {
                 info->dma = 0;
                 dma_error = HWIF(drive)->ide_dma_end(drive);
+                if (dma_error) {
+                        printk(KERN_ERR "%s: DMA %s error\n", drive->name,
+                                        rq_data_dir(rq) ? "write" : "read");
+                        ide_dma_off(drive);
+                }
         }
 
         if (cdrom_decode_status(drive, 0, &stat))
@@ -1683,11 +1688,8 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
          * using dma, transfer is complete now
          */
         if (dma) {
-                if (dma_error) {
-                        printk(KERN_ERR "ide-cd: dma error\n");
-                        ide_dma_off(drive);
+                if (dma_error)
                         return ide_error(drive, "dma error", stat);
-                }
 
                 spin_lock_irqsave(&ide_lock, flags);
                 if (__blk_end_request(rq, 0, rq->data_len))