From bad35be8d0869128eb3ee04966d4d36bc305d759 Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <nikanth@google.com>
Date: Tue, 14 Jun 2011 11:23:46 +0530
Subject: [PATCH] --- yaml --- r: 255765 b: refs/heads/master c:
 545a8aa793e04bee7a7e2aa8caa70bed94fd7a5c h: refs/heads/master i:   255763:
 dfc38081a1ce6f11919809d7f33b7bb1b0e0fc52 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/if_spi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 086cc054e77b..816e3e5c5760 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7520b1d2a9ffae94323ffac9dc37d92f656051f
+refs/heads/master: 545a8aa793e04bee7a7e2aa8caa70bed94fd7a5c
diff --git a/trunk/drivers/net/wireless/libertas/if_spi.c b/trunk/drivers/net/wireless/libertas/if_spi.c
index 463352c890d7..d041bb2b5777 100644
--- a/trunk/drivers/net/wireless/libertas/if_spi.c
+++ b/trunk/drivers/net/wireless/libertas/if_spi.c
@@ -1032,7 +1032,6 @@ static irqreturn_t if_spi_host_interrupt(int irq, void *dev_id)
 static int if_spi_init_card(struct if_spi_card *card)
 {
 	struct lbs_private *priv = card->priv;
-	struct spi_device *spi = card->spi;
 	int err, i;
 	u32 scratch;
 	const struct firmware *helper = NULL;
@@ -1080,8 +1079,9 @@ static int if_spi_init_card(struct if_spi_card *card)
 				"attached to SPI bus_num %d, chip_select %d. "
 				"spi->max_speed_hz=%d\n",
 				card->card_id, card->card_rev,
-				spi->master->bus_num, spi->chip_select,
-				spi->max_speed_hz);
+				card->spi->master->bus_num,
+				card->spi->chip_select,
+				card->spi->max_speed_hz);
 		err = if_spi_prog_helper_firmware(card, helper);
 		if (err)
 			goto out;