From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759291AbYFLXK7 (ORCPT ); Thu, 12 Jun 2008 19:10:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754702AbYFLXKq (ORCPT ); Thu, 12 Jun 2008 19:10:46 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:23855 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753400AbYFLXKp (ORCPT ); Thu, 12 Jun 2008 19:10:45 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=RjN9uEZMS93eo2GGhwWBeoHEqqeUAQE4dyjgV2d8y50lATadx72FF5oHV74WEPHL2j 89li2cgFHPrmsjj+Zu6TUxlwDg0tPUQUQGpIIYn8wFVz6ovCZLZZc9vYP2nTZ4rh+Ttr dQqISPuSPacSjKjL0QSS2Gg+HuHZ7j2y8Gwro= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, Bartlomiej Zolnierkiewicz , Benjamin Herrenschmidt , linux-kernel@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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) {