UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide-cd: fix error messages in cdrom_write_intr() 

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2007-12-24 15:23:43 +01:00
parent 31a7119165
commit b481b23868
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/ide/ide-cd.c
View File

@ -1805,8 +1805,9 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
/* Check for errors. */ /* Check for errors. */
if (dma) { if (dma) {
info->dma = 0; info->dma = 0;
if ((dma_error = HWIF(drive)->ide_dma_end(drive))) { dma_error = HWIF(drive)->ide_dma_end(drive);
printk(KERN_ERR "ide-cd: write dma error\n"); if (dma_error) {
printk(KERN_ERR "%s: DMA write error\n", drive->name);
ide_dma_off(drive); ide_dma_off(drive);
} }
} }
@ -1839,8 +1840,9 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
*/ */
uptodate = 1; uptodate = 1;
if (rq->current_nr_sectors > 0) { if (rq->current_nr_sectors > 0) {
printk(KERN_ERR "%s: write_intr: data underrun (%d blocks)\n", printk(KERN_ERR "%s: %s: data underrun (%d blocks)\n",
drive->name, rq->current_nr_sectors); drive->name, __FUNCTION__,
rq->current_nr_sectors);
uptodate = 0; uptodate = 0;
} }
cdrom_end_request(drive, uptodate); cdrom_end_request(drive, uptodate);
@ -1860,7 +1862,8 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
int this_transfer; int this_transfer;
if (!rq->current_nr_sectors) { 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; break;
} }