[PATCH] mtd_dataflash: Fix probing of AT45DB321C chips.

[PATCH] mtd_dataflash: Fix probing of AT45DB321C chips.

[Will Newton]

[-- Attachment #1: Type: text/plain, Size: 724 bytes --]

Commit 771999b65f79264acde4b855e5d35696eca5e80c 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.

Signed-off-by: Will Newton <will.newton@gmail.com>
---
 drivers/mtd/devices/mtd_dataflash.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/devices/mtd_dataflash.c
b/drivers/mtd/devices/mtd_dataflash.c
index d44f741..cd4781f 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -822,6 +822,8 @@ static struct flash_info *__devinit
jedec_probe(struct spi_device *spi)
 						return info;
 				}
 			}
+			else
+				return info;
 		}
 	}

-- 
1.5.5.2

[-- Attachment #2: 0001-mtd_dataflash-Fix-probing-of-AT45DB321C-chips.patch --]
[-- Type: application/octet-stream, Size: 942 bytes --]

From 1b34659677fdab0b03590d189afe1820d250f095 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Wed, 4 Mar 2009 10:29:19 +0000
Subject: [PATCH] mtd_dataflash: Fix probing of AT45DB321C chips.

Commit 771999b65f79264acde4b855e5d35696eca5e80c 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.

Signed-off-by: Will Newton <will.newton@gmail.com>
---
 drivers/mtd/devices/mtd_dataflash.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index d44f741..cd4781f 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -822,6 +822,8 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
 						return info;
 				}
 			}
+			else
+				return info;
 		}
 	}
 
-- 
1.5.5.2

Re: [PATCH] mtd_dataflash: Fix probing of AT45DB321C chips.

[David Brownell]

On Wednesday 04 March 2009, Will Newton wrote:
> Commit 771999b65f79264acde4b855e5d35696eca5e80c 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.
> 
> Signed-off-by: Will Newton <will.newton@gmail.com>

Acked-by: David Brownell <dbrownell@users.sourceforge.net>

.... these are the *only* such chips with that issue, first
version of the more capable generations of chips.

Out of curiousity, was this observed with a C-rev chip, or
inferred by noticing it was the only chip that could ever
need such an "else" branch?

> ---
>  drivers/mtd/devices/mtd_dataflash.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/devices/mtd_dataflash.c
> b/drivers/mtd/devices/mtd_dataflash.c
> index d44f741..cd4781f 100644
> --- a/drivers/mtd/devices/mtd_dataflash.c
> +++ b/drivers/mtd/devices/mtd_dataflash.c
> @@ -822,6 +822,8 @@ static struct flash_info *__devinit
> jedec_probe(struct spi_device *spi)
>  						return info;
>  				}
>  			}
> +			else
> +				return info;
>  		}
>  	}
> 
> -- 
> 1.5.5.2
>