diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
commit | 3c1f67d60e2b4f4455563928999fd41cc653645d (patch) | |
tree | 0d58c145a05fb09167f1ab6882b474eccb1f3563 /drivers/mtd/devices/mtd_dataflash.c | |
parent | 03d78913f01e8f6599823f00357ed17b32747d3d (diff) | |
parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
download | op-kernel-dev-3c1f67d60e2b4f4455563928999fd41cc653645d.zip op-kernel-dev-3c1f67d60e2b4f4455563928999fd41cc653645d.tar.gz |
Merge branch 'linus' into core/locking
Diffstat (limited to 'drivers/mtd/devices/mtd_dataflash.c')
-rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index d44f741..6d9f810 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -821,7 +821,8 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) if (!(info->flags & IS_POW2PS)) return info; } - } + } else + return info; } } |