diff options
| author | David Brownell <david-b@pacbell.net> | 2006-12-29 19:48:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 13:56:42 -0500 |
| commit | 17c65d69906a6e2e6df4822b00a9e5e00e35ea9a (patch) | |
| tree | b97eb8c55a475c9543272d3ba9993232c273fcfb | |
| parent | 4b1badf5d9ddfc46ad075ca5bfc465972c85cc7c (diff) | |
[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>
| -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) | |||
| 437 | * or JEDEC get-id commands. Try them ... | 437 | * or JEDEC get-id commands. Try them ... |
| 438 | */ | 438 | */ |
| 439 | DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n", | 439 | DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n", |
| 440 | flash->spi->dev.bus_id); | 440 | spi->dev.bus_id); |
| 441 | return -ENODEV; | 441 | return -ENODEV; |
| 442 | } | 442 | } |
| 443 | 443 | ||
| @@ -447,7 +447,7 @@ static int __devinit m25p_probe(struct spi_device *spi) | |||
| 447 | } | 447 | } |
| 448 | if (i == ARRAY_SIZE(m25p_data)) { | 448 | if (i == ARRAY_SIZE(m25p_data)) { |
| 449 | DEBUG(MTD_DEBUG_LEVEL1, "%s: unrecognized id %s\n", | 449 | DEBUG(MTD_DEBUG_LEVEL1, "%s: unrecognized id %s\n", |
| 450 | flash->spi->dev.bus_id, data->type); | 450 | spi->dev.bus_id, data->type); |
| 451 | return -ENODEV; | 451 | return -ENODEV; |
| 452 | } | 452 | } |
| 453 | 453 | ||
