From b72319316dd4a14831625d5d8ff12a5abb4880a3 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <petkovbb@googlemail.com>
Date: Wed, 16 Jul 2008 20:33:45 +0200
Subject: [PATCH] --- yaml --- r: 102120 b: refs/heads/master c:
 af6765ce9f535f20e6f9975269660fe49594745a h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-cd.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b3a983a97749..888754ebb79f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce30e4015954e281f682aa8d158a47885d8e1262
+refs/heads/master: af6765ce9f535f20e6f9975269660fe49594745a
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index e12d60278210..eb4b27548caf 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -517,14 +517,9 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
 						  int xferlen,
 						  ide_handler_t *handler)
 {
-	ide_startstop_t startstop;
 	struct cdrom_info *info = drive->driver_data;
 	ide_hwif_t *hwif = drive->hwif;
 
-	/* wait for the controller to be idle */
-	if (ide_wait_stat(&startstop, drive, 0, BUSY_STAT, WAIT_READY))
-		return startstop;
-
 	/* FIXME: for Virtual DMA we must check harder */
 	if (info->dma)
 		info->dma = !hwif->dma_ops->dma_setup(drive);