From fdf0e9646918425072557b64ac0e46e8272fb312 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 24 Dec 2007 15:23:43 +0100 Subject: [PATCH] --- yaml --- r: 75199 b: refs/heads/master c: b481b23868928443931190c91e7c06e23913149d h: refs/heads/master i: 75197: 6c84153da9d3805fbe17c54a016a37f7abcb6f86 75195: 0ba7a28be8b85e5741f0b7ebfc1bebbae8da3331 75191: d08c01b0792d6ac76ae629ad1c51d8aa9c3704f4 75183: cb90e307fd6d6019fb3af45cb28485a212649946 75167: 31ec2cb04b72f0b07b5e0320da6f9e68989595f1 75135: 1f3b55579f5ab8cc173ac9ec6525711b2bf00b9b v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ca6de1b07069..c518559c42a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31a71191650dce1bb4a7de6147f1947795826cda +refs/heads/master: b481b23868928443931190c91e7c06e23913149d diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index 30f27585a7d3..3d48a02caaee 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -1805,8 +1805,9 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive) /* 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); } } @@ -1839,8 +1840,9 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive) */ 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); @@ -1860,7 +1862,8 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive) 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; }