blob: 71d3a920bb0f5e25ad5b4db75961f7234375cb2f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
|
diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/drivers/mtd/devices/m25p80.c linux-2.6.32.3/drivers/mtd/devices/m25p80.c
--- linux-2.6.32.3-vanilla/drivers/mtd/devices/m25p80.c 2010-01-06 17:07:45.000000000 -0600
+++ linux-2.6.32.3/drivers/mtd/devices/m25p80.c 2010-10-14 11:36:06.000000000 -0500
@@ -780,7 +780,7 @@ static int __devinit m25p_probe(struct s
* with the software protection bits set
*/
- if (info->jedec_id >> 16 == 0x1f) {
+ if (info->jedec_id >> 16 == 0x1f || info->jedec_id == 0xbf258e) {
write_enable(flash);
write_sr(flash, 0);
}
|
