diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-11 01:55:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-11 01:55:03 -0500 |
| commit | d4a66e752d0b19934dd208884f8605fe385aaaa9 (patch) | |
| tree | 72fb727be1d7636aae9cddfe9aa93ac9dec75daf /drivers/net/can | |
| parent | bdbec4b86ee99b020e159f9bd604003a3ae3b0ab (diff) | |
| parent | fa15e99b6bb44aa86b241a43ca8c509e91f80153 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/mcp251x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index 9c5a1537939c..1a72ca066a17 100644 --- a/drivers/net/can/mcp251x.c +++ b/drivers/net/can/mcp251x.c | |||
| @@ -990,7 +990,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) | |||
| 990 | goto error_tx_buf; | 990 | goto error_tx_buf; |
| 991 | } | 991 | } |
| 992 | priv->spi_rx_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL); | 992 | priv->spi_rx_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL); |
| 993 | if (!priv->spi_tx_buf) { | 993 | if (!priv->spi_rx_buf) { |
| 994 | ret = -ENOMEM; | 994 | ret = -ENOMEM; |
| 995 | goto error_rx_buf; | 995 | goto error_rx_buf; |
| 996 | } | 996 | } |