From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Fri, 16 Mar 2007 21:38:20 +0000 (-0800)
Subject: [PATCH] SPI: at25: do not use pointer before assignment
X-Git-Tag: v2.6.21-rc5~94
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ca97d26a7efe9488174336bc67fdaea01aad49;p=linux-2.6

[PATCH] SPI: at25: do not use pointer before assignment

Prevents a potential oops with CONFIG_SPI_DEBUG given flakey hardware or
incorrect configuration.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/spi/at25.c b/drivers/spi/at25.c
index 48e4f48e77..8efa07e8b8 100644
--- a/drivers/spi/at25.c
+++ b/drivers/spi/at25.c
@@ -291,7 +291,7 @@ static int at25_probe(struct spi_device *spi)
 	 */
 	sr = spi_w8r8(spi, AT25_RDSR);
 	if (sr < 0 || sr & AT25_SR_nRDY) {
-		dev_dbg(&at25->spi->dev, "rdsr --> %d (%02x)\n", sr, sr);
+		dev_dbg(&spi->dev, "rdsr --> %d (%02x)\n", sr, sr);
 		err = -ENXIO;
 		goto fail;
 	}