From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760546AbZCNArl (ORCPT ); Fri, 13 Mar 2009 20:47:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754181AbZCNAUA (ORCPT ); Fri, 13 Mar 2009 20:20:00 -0400 Received: from kroah.org ([198.145.64.141]:35029 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753861AbZCNATo (ORCPT ); Fri, 13 Mar 2009 20:19:44 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 17:07:51 2009 Message-Id: <20090314000751.654818834@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 17:06:31 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Sergei Shtylyov , Bartlomiej Zolnierkiewicz Subject: [patch 83/96] ide-iops: fix odd-length ATAPI PIO transfers References: <20090314000508.803142980@mini.kroah.org> Content-Disposition: inline; filename=ide-iops-fix-odd-length-atapi-pio-transfers.patch In-Reply-To: <20090314001449.GA4485@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Sergei Shtylyov commit a509538d4fb4f99cdf0a095213d57cc3b2347615 upstream. Commit 9567b349f7e7dd7e2483db99ee8e4a6fe0caca38 (ide: merge ->atapi_*put_bytes and ->ata_*put_data methods) introduced a regression WRT the odd-length ATAPI PIO transfers -- the final word didn't get written (causing command timeouts). Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/ide/ide-iops.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -325,6 +325,8 @@ void ide_output_data(ide_drive_t *drive, u8 io_32bit = drive->io_32bit; u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; + len++; + if (io_32bit) { unsigned long uninitialized_var(flags);