From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.158]) by ozlabs.org (Postfix) with ESMTP id 24580DE0E3 for ; Fri, 13 Jun 2008 09:10:45 +1000 (EST) Received: by fg-out-1718.google.com with SMTP id d23so2639026fga.39 for ; Thu, 12 Jun 2008 16:10:43 -0700 (PDT) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Date: Fri, 13 Jun 2008 01:12:24 +0200 Message-Id: <20080612231224.18335.91182.sendpatchset@localhost.localdomain> Subject: [PATCH 1/7] ide-pmac: bugfix for media-bay support rework Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org, Bartlomiej Zolnierkiewicz List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Fix bug introduced by: commit 2dde7861afa23cd59db83515cb0b810b92b220aa Author: Bartlomiej Zolnierkiewicz Date: Fri Apr 18 00:46:23 2008 +0200 ide: rework PowerMac media-bay support (take 2) ... [ Yeah, I suck. ] bay->cd_index shouldn't be changed if IDE devices are not present or retry operations won't happen. Cc: Benjamin Herrenschmidt Signed-off-by: Bartlomiej Zolnierkiewicz --- first three patches are meant for 2.6.26, the rest for 2.6.27 drivers/macintosh/mediabay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: b/drivers/macintosh/mediabay.c =================================================================== --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -556,7 +556,8 @@ static void media_bay_step(int i) printk("mediabay %d, registering IDE...\n", i); pmu_suspend(); ide_port_scan(bay->cd_port); - bay->cd_index = bay->cd_port->index; + if (bay->cd_port->present) + bay->cd_index = bay->cd_port->index; pmu_resume(); } if (bay->cd_index == -1) {