Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761236AbZFIKZc (ORCPT ); Tue, 9 Jun 2009 06:25:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760642AbZFIKT3 (ORCPT ); Tue, 9 Jun 2009 06:19:29 -0400 Received: from kroah.org ([198.145.64.141]:54830 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760678AbZFIKT2 (ORCPT ); Tue, 9 Jun 2009 06:19:28 -0400 X-Mailbox-Line: From greg@blue.kroah.org Tue Jun 9 02:41:00 2009 Message-Id: <20090609094100.715289290@blue.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 09 Jun 2009 02:39:25 -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, Peter Korsgaard , Artem Bityutskiy , David Woodhouse , Greg Kroah-Hartman Subject: [patch 37/87] mtd_dataflash: unbreak erase support References: <20090609093848.204935043@blue.kroah.org> Content-Disposition: inline; filename=mtd_dataflash-unbreak-erase-support.patch In-Reply-To: <20090609094451.GA26439@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1515 Lines: 30 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Peter Korsgaard commit dbf8c11f821b6ff83302c34f2403b4f7231f50ae upstream. Commit 5b7f3a50 (fix dataflash 64-bit divisions) unfortunately introduced a typo. Erase addr and len were swapped in the pageaddr calculation, causing the wrong sectors to get erased. Signed-off-by: Peter Korsgaard Acked-by: Artem Bityutskiy Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/devices/mtd_dataflash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -184,7 +184,7 @@ static int dataflash_erase(struct mtd_in /* Calculate flash page address; use block erase (for speed) if * we're at a block boundary and need to erase the whole block. */ - pageaddr = div_u64(instr->len, priv->page_size); + pageaddr = div_u64(instr->addr, priv->page_size); do_block = (pageaddr & 0x7) == 0 && instr->len >= blocksize; pageaddr = pageaddr << priv->page_offset; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/