diff options
| author | David Brownell <david-b@pacbell.net> | 2006-12-30 01:48:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 19:56:42 +0100 |
| commit | 17c65d69906a6e2e6df4822b00a9e5e00e35ea9a (patch) | |
| tree | b97eb8c55a475c9543272d3ba9993232c273fcfb /drivers/mtd/devices/m25p80.c | |
| parent | [PATCH] SPI: define null tx_buf to mean "shift out zeroes" (diff) | |
| download | linux-17c65d69906a6e2e6df4822b00a9e5e00e35ea9a.tar.xz linux-17c65d69906a6e2e6df4822b00a9e5e00e35ea9a.zip | |
[PATCH] m25p80 build fixes (with MTD debug)
Fix build issues that show up with the m25p80 SPI flash driver when
building with MTD debug enabled.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 334e078ffaff..78c2511ae9e0 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -437,7 +437,7 @@ static int __devinit m25p_probe(struct spi_device *spi) * or JEDEC get-id commands. Try them ... */ DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n", - flash->spi->dev.bus_id); + spi->dev.bus_id); return -ENODEV; } @@ -447,7 +447,7 @@ static int __devinit m25p_probe(struct spi_device *spi) } if (i == ARRAY_SIZE(m25p_data)) { DEBUG(MTD_DEBUG_LEVEL1, "%s: unrecognized id %s\n", - flash->spi->dev.bus_id, data->type); + spi->dev.bus_id, data->type); return -ENODEV; } |