From 16c82d16864e7db9591a86f929d91e2f6fdff834 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 27 Dec 2009 11:27:44 +0000
Subject: [PATCH] --- yaml --- r: 179078 b: refs/heads/master c:
 ce739b473ce12d5ef067b39b8637bfd2b2174a15 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/can/mcp251x.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b43b09956c92..cb96b8b6e9ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 073bd90f03d98bc3168865f21573c9b232777c13
+refs/heads/master: ce739b473ce12d5ef067b39b8637bfd2b2174a15
diff --git a/trunk/drivers/net/can/mcp251x.c b/trunk/drivers/net/can/mcp251x.c
index 9c5a1537939c..1a72ca066a17 100644
--- a/trunk/drivers/net/can/mcp251x.c
+++ b/trunk/drivers/net/can/mcp251x.c
@@ -990,7 +990,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
 			goto error_tx_buf;
 		}
 		priv->spi_rx_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL);
-		if (!priv->spi_tx_buf) {
+		if (!priv->spi_rx_buf) {
 			ret = -ENOMEM;
 			goto error_rx_buf;
 		}