From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752604AbYL2TCZ (ORCPT ); Mon, 29 Dec 2008 14:02:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751860AbYL2TCJ (ORCPT ); Mon, 29 Dec 2008 14:02:09 -0500 Received: from mail-bw0-f21.google.com ([209.85.218.21]:37755 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751571AbYL2TCI (ORCPT ); Mon, 29 Dec 2008 14:02:08 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=TAdr6CR1/DOv+OEfkhri1D9HVSMaPu7yCCJ5/vCOt08MvEyaWco6hxTEk2I7T+lwc/ NhLfNMGcbUKFRgGqKGlFa/AOg4cf5EnkxN9bBOvBotWRxHzBuS2Uko9JGgq4ThjRLnWZ ofHWDt8KmBELdxqyZWsw86t+eZngardQaNTho= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Subject: [PATCH] ide: fix IDE ACPI regression breaking suspend Date: Mon, 29 Dec 2008 19:36:48 +0100 User-Agent: KMail/1.10.3 (Linux/2.6.28-rc8-next-20081219; KDE/4.1.3; i686; ; ) Cc: linux-kernel@vger.kernel.org, David Roka , "Rafael J. Wysocki" , Len Brown MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Message-Id: <200812291936.50390.bzolnier@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id mBTJ4tX1000760 Commit 4dde4492d850a4c9bcaa92e5bd7f4eebe3e2f5ab ("ide: make drive->idan union (take 2)") accidentally introduced an IDE ACPI regression whichat least on some machines confuses ACPI and breaks suspend. Fix it. Fixes kernel.org bug #12279:http://bugzilla.kernel.org/show_bug.cgi?id=12279 [ Sorry about the bug (IDE ACPI is not used by default so it managed to slip in). Still it is kind of surprising that the bug breaks suspend as it shouldn't impact anything except IDE ACPI (it seems that it uncovered either some ACPI/PM deficiency or a BIOS bug). ] Reported-and-bisected-by: David Roka Tested-by: David Roka Cc: Rafael J. Wysocki Cc: Len Brown Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: b/drivers/ide/ide-acpi.c===================================================================--- a/drivers/ide/ide-acpi.c+++ b/drivers/ide/ide-acpi.c@@ -615,10 +615,10 @@ void ide_acpi_push_timing(ide_hwif_t *hw in_params[0].buffer.length = sizeof(struct GTM_buffer); in_params[0].buffer.pointer = (u8 *)&hwif->acpidata->gtm; in_params[1].type = ACPI_TYPE_BUFFER;- in_params[1].buffer.length = sizeof(ATA_ID_WORDS * 2);+ in_params[1].buffer.length = ATA_ID_WORDS * 2; in_params[1].buffer.pointer = (u8 *)&master->idbuff; in_params[2].type = ACPI_TYPE_BUFFER;- in_params[2].buffer.length = sizeof(ATA_ID_WORDS * 2);+ in_params[2].buffer.length = ATA_ID_WORDS * 2; in_params[2].buffer.pointer = (u8 *)&slave->idbuff; /* Output buffer: _STM has no output */ {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I