Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 0bdf77f8 authored Jan 28, 2008 by Roel Kluin Committed by David Woodhouse Feb 03, 2008

[MTD] [NOR] Test devtype, not definition in flash_probe(), drivers/mtd/devices/lart.c



drivers/mtd/devices/lart.c:119:#define FLASH_DEVICE_16mbit_BOTTOM 0x88f488f4
As was, unless "manufacturer != FLASH_MANUFACTURER" this returned true

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

parent 9308758c

drivers/mtd/devices/lart.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -323,7 +323,7 @@ static int flash_probe (void)
	/* put the flash back into command mode */		/* put the flash back into command mode */
	write32 (DATA_TO_FLASH (READ_ARRAY),0x00000000);		write32 (DATA_TO_FLASH (READ_ARRAY),0x00000000);

	return (manufacturer == FLASH_MANUFACTURER && (devtype == FLASH_DEVICE_16mbit_TOP \|\| FLASH_DEVICE_16mbit_BOTTOM));		return (manufacturer == FLASH_MANUFACTURER && (devtype == FLASH_DEVICE_16mbit_TOP \|\| devtype == FLASH_DEVICE_16mbit_BOTTOM));
	}		}

	/*		/*