Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764046AbZCNBiz (ORCPT ); Fri, 13 Mar 2009 21:38:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754513AbZCNBUy (ORCPT ); Fri, 13 Mar 2009 21:20:54 -0400 Received: from kroah.org ([198.145.64.141]:35268 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753780AbZCNBUd (ORCPT ); Fri, 13 Mar 2009 21:20:33 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:39 2009 Message-Id: <20090314011038.947763527@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:10:28 -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, Will Newton , David Woodhouse , David Brownell Subject: [patch 051/114] mtd_dataflash: fix probing of AT45DB321C chips. References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=mtd_dataflash-fix-probing-of-at45db321c-chips.patch In-Reply-To: <20090314011649.GA26170@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1433 Lines: 34 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Will Newton commit 229cc58ba2b5a83b0b55764c6cb98695c106238a upstream. Commit 771999b65f79264acde4b855e5d35696eca5e80c ("[MTD] DataFlash: bugfix, binary page sizes now handled") broke support for probing AT45DB321C flash chips. These chips do not support the "page size" status bit, so if we match the JEDEC id return early. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Will Newton Cc: David Woodhouse Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/devices/mtd_dataflash.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -815,7 +815,8 @@ static struct flash_info *__devinit jede if (!(info->flags & IS_POW2PS)) return info; } - } + } else + return info; } } -- 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/