diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /drivers/net/can/mcp251x.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'drivers/net/can/mcp251x.c')
| -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 | } |