ide-cd: fix error messages in cdrom_write_intr()
PATCH 6/63 ide-cd: fix error messages in cdrom_write_intr()
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ide-cd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/ide/ide-cd.c +8 -5
@@ -1799,8 +1799,9 @@ static ide_startstop_t cdrom_write_intr(/* Check for errors. */ if (dma) { info->dma =0 ; -if ((dma_error =HWIF (drive)->ide_dma_end (drive))) { -printk (KERN_ERR "ide-cd: write dma error\n" ); + dma_error =HWIF (drive)->ide_dma_end (drive); +if (dma_error) { +printk (KERN_ERR "%s: DMA write error\n" , drive->name);ide_dma_off (drive); } }
@@ -1833,8 +1834,9 @@ static ide_startstop_t cdrom_write_intr(*/ uptodate =1 ;if (rq->current_nr_sectors >0 ) { -printk (KERN_ERR "%s: write_intr: data underrun (%d blocks)\n" , - drive->name, rq->current_nr_sectors); +printk (KERN_ERR "%s: %s: data underrun (%d blocks)\n" , + drive->name, __FUNCTION__, + rq->current_nr_sectors); uptodate =0 ; }cdrom_end_request (drive, uptodate);
@@ -1854,7 +1856,8 @@ static ide_startstop_t cdrom_write_intr(int this_transfer;if (!rq->current_nr_sectors) { -printk (KERN_ERR "ide-cd: write_intr: oops\n" ); +printk (KERN_ERR "%s: %s: confused, missing data\n" , + drive->name, __FUNCTION__);break ; }
Quoted 1 line · Bartlomiej Zolnierkiewicz
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>
MBR, Sergei