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

Commit 17c65d69 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

[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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4b1badf5

drivers/mtd/devices/m25p80.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}