From 1e1857aac4946b2a99c7296b0766cd3af1dc847a Mon Sep 17 00:00:00 2001 From: David Brownell Date: Fri, 29 Dec 2006 16:48:44 -0800 Subject: [PATCH] --- yaml --- r: 45121 b: refs/heads/master c: 17c65d69906a6e2e6df4822b00a9e5e00e35ea9a h: refs/heads/master i: 45119: 4568485caa4800b80df391661da289dc6fad23ea v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8be339fd3613..0376f32a9fe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b1badf5d9ddfc46ad075ca5bfc465972c85cc7c +refs/heads/master: 17c65d69906a6e2e6df4822b00a9e5e00e35ea9a diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 334e078ffaff..78c2511ae9e0 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/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; }