From: Bartlomiej Zolnierkiewicz Date: Tue, 15 Jul 2008 19:21:51 +0000 (+0200) Subject: ide-scsi: fix race in idescsi_transfer_pc() X-Git-Tag: v2.6.27-rc1~1078^2~41 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b3d96afccf8b5c67b66a61efb88c53ff029c6611;p=linux-2.6-omap-h63xx.git ide-scsi: fix race in idescsi_transfer_pc() Start DMA engine before sending content of packet command (otherwise it is possible that IRQ will happen before DMA engine is started). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 569ffde6d04..2553ef4d5a9 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c @@ -494,13 +494,14 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive) /* Set the interrupt routine */ ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry); - /* Send the actual packet */ - hwif->output_data(drive, NULL, scsi->pc->c, 12); - if (pc->flags & PC_FLAG_DMA_OK) { pc->flags |= PC_FLAG_DMA_IN_PROGRESS; hwif->dma_ops->dma_start(drive); } + + /* Send the actual packet */ + hwif->output_data(drive, NULL, scsi->pc->c, 12); + return ide_started; }