* [PATCH 13/63] ide-cd: fix DMA error handling in cdrom_newpc_intr()
@ 2007-12-20 1:02 Bartlomiej Zolnierkiewicz
2007-12-21 12:03 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-12-20 1:02 UTC (permalink / raw)
To: linux-ide; +Cc: linux-kernel
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)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-cd.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
Index: b/drivers/ide/ide-cd.c
===================================================================
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1663,6 +1663,11 @@ static ide_startstop_t cdrom_newpc_intr(
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))
@@ -1672,11 +1677,8 @@ static ide_startstop_t cdrom_newpc_intr(
* 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);
- }
end_that_request_chunk(rq, 1, rq->data_len);
rq->data_len = 0;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 13/63] ide-cd: fix DMA error handling in cdrom_newpc_intr()
2007-12-20 1:02 [PATCH 13/63] ide-cd: fix DMA error handling in cdrom_newpc_intr() Bartlomiej Zolnierkiewicz
@ 2007-12-21 12:03 ` Sergei Shtylyov
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2007-12-21 12:03 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel
Bartlomiej Zolnierkiewicz wrote:
> 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)
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
MBR, Sergei
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-21 12:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-20 1:02 [PATCH 13/63] ide-cd: fix DMA error handling in cdrom_newpc_intr() Bartlomiej Zolnierkiewicz
2007-12-21 12:03 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).