diff options
| author | David S. Miller | 2010-01-11 07:55:03 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-01-11 07:55:03 +0100 |
| commit | d4a66e752d0b19934dd208884f8605fe385aaaa9 (patch) | |
| tree | 72fb727be1d7636aae9cddfe9aa93ac9dec75daf /drivers/net/can | |
| parent | ixgbe: Fix ethtool diag test for VT mode operation (diff) | |
| parent | vxge: use pci_dma_mapping_error to test return value (diff) | |
| download | kernel-qcow2-linux-d4a66e752d0b19934dd208884f8605fe385aaaa9.tar.gz kernel-qcow2-linux-d4a66e752d0b19934dd208884f8605fe385aaaa9.tar.xz kernel-qcow2-linux-d4a66e752d0b19934dd208884f8605fe385aaaa9.zip | |
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) 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; } |