diff options
| author | Borislav Petkov <petkovbb@gmail.com> | 2009-01-06 19:20:58 +0300 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-06 19:20:58 +0300 |
| commit | d6251d4488a361c93da2398818e1ec69cffb6073 (patch) | |
| tree | 25ce4225e9a0fd0ade887580d225a583b80fe9f2 /drivers/ide/ide-atapi.c | |
| parent | 1e91477aa335fc1c97eb15649ed1a1714cc758ec (diff) | |
| download | linux-d6251d4488a361c93da2398818e1ec69cffb6073.tar.xz | |
ide-cd: convert to ide-atapi facilities
... and remove no longer needed cdrom_start_packet_command and
cdrom_transfer_packet_command.
Tested lightly with ide-cd and ide-floppy.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
| -rw-r--r-- | drivers/ide/ide-atapi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index d6a50d67b7db..e96c01260598 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -549,7 +549,10 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) } /* Set the interrupt routine */ - ide_set_handler(drive, ide_pc_intr, timeout, expiry); + ide_set_handler(drive, + (dev_is_idecd(drive) ? drive->irq_handler + : ide_pc_intr), + timeout, expiry); /* Begin DMA, if necessary */ if (dev_is_idecd(drive)) { |