1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 5ed00069846d..6c4f0f081785 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -588,19 +588,14 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
                 hwif->sg_mapped = 0;
         }
 
-        SELECT_DRIVE(drive);
-
         ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK, bcount, dma);
 
         if (dma)
                 set_bit(PC_DMA_OK, &pc->flags);
 
         if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
-                BUG_ON(HWGROUP(drive)->handler != NULL);
-                ide_set_handler(drive, &idescsi_transfer_pc,
-                                get_timeout(pc), idescsi_expiry);
-                /* Issue the packet command */
-                HWIF(drive)->OUTB(WIN_PACKETCMD, IDE_COMMAND_REG);
+                ide_execute_command(drive, WIN_PACKETCMD, &idescsi_transfer_pc,
+                                    get_timeout(pc), idescsi_expiry);
                 return ide_started;
         } else {
                 /* Issue the packet command */