From 7cc783601cc85d41eed49f3be334b14082b4143b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 26 Dec 2012 20:51:13 -0600 Subject: [PATCH] --- yaml --- r: 348729 b: refs/heads/master c: 0d826c3919ceede3c6afc3e87fc7087e0c863e7e h: refs/heads/master i: 348727: 49e52f4ab3621b4c47df3a0ee95442d497397661 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3754cbc5ce88..be26cf51f5e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efe57d5977fa62b8fdf3a38c236d1aa5351228be +refs/heads/master: 0d826c3919ceede3c6afc3e87fc7087e0c863e7e diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index ae38475854b5..d10d75e8a33f 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -937,7 +937,8 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) dma_tmp = pci_map_single(pdev, buf, bufsize * sizeof(u8), PCI_DMA_FROMDEVICE); - + if (pci_dma_mapping_error(pdev, dma_tmp)) + return -1; if (-1 == buffer_add(&(priv->rxbuffer), buf, dma_tmp, &(priv->rxbufferhead))) { DMESGE("Unable to allocate mem RX buf");