diff options
author | Borislav Petkov <petkovbb@googlemail.com> | 2008-07-16 14:33:45 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 14:33:45 -0400 |
commit | af6765ce9f535f20e6f9975269660fe49594745a (patch) | |
tree | 07e5006eb46a82373897f5fc0a8d899949ce353d /drivers/ide/ide-cd.c | |
parent | ce30e4015954e281f682aa8d158a47885d8e1262 (diff) |
ide-cd: remove wait-for-idle-controller bit in cdrom_start_packet_command
This is done in the request issue path anyway.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index e12d60278210..eb4b27548caf 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -517,14 +517,9 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive, | |||
517 | int xferlen, | 517 | int xferlen, |
518 | ide_handler_t *handler) | 518 | ide_handler_t *handler) |
519 | { | 519 | { |
520 | ide_startstop_t startstop; | ||
521 | struct cdrom_info *info = drive->driver_data; | 520 | struct cdrom_info *info = drive->driver_data; |
522 | ide_hwif_t *hwif = drive->hwif; | 521 | ide_hwif_t *hwif = drive->hwif; |
523 | 522 | ||
524 | /* wait for the controller to be idle */ | ||
525 | if (ide_wait_stat(&startstop, drive, 0, BUSY_STAT, WAIT_READY)) | ||
526 | return startstop; | ||
527 | |||
528 | /* FIXME: for Virtual DMA we must check harder */ | 523 | /* FIXME: for Virtual DMA we must check harder */ |
529 | if (info->dma) | 524 | if (info->dma) |
530 | info->dma = !hwif->dma_ops->dma_setup(drive); | 525 | info->dma = !hwif->dma_ops->dma_setup(drive); |