diff options
author | Roar Førde <roar.forde@stericsson.com> | 2011-12-06 07:15:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-06 17:21:47 -0500 |
commit | f84ea779c25dabc90956f1c329e5e5c501ea96cc (patch) | |
tree | 8a66cb38fb4f7d04bf5a1c3405c73802eaac0614 /drivers/net/caif/caif_shmcore.c | |
parent | 095d2a71e51bd2a3e476232156e8d9c2dbc0596d (diff) |
caif: Replace BUG_ON with WARN_ON.
BUG_ON is too strict in a number of circumstances,
use WARN_ON instead. Protocol errors should not halt the system.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif/caif_shmcore.c')
-rw-r--r-- | drivers/net/caif/caif_shmcore.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c index fd59e37e28a..5b2041319a3 100644 --- a/drivers/net/caif/caif_shmcore.c +++ b/drivers/net/caif/caif_shmcore.c | |||
@@ -337,7 +337,11 @@ static void shm_rx_work_func(struct work_struct *rx_work) | |||
337 | /* Get a suitable CAIF packet and copy in data. */ | 337 | /* Get a suitable CAIF packet and copy in data. */ |
338 | skb = netdev_alloc_skb(pshm_drv->pshm_dev->pshm_netdev, | 338 | skb = netdev_alloc_skb(pshm_drv->pshm_dev->pshm_netdev, |
339 | frm_pck_len + 1); | 339 | frm_pck_len + 1); |
340 | BUG_ON(skb == NULL); | 340 | |
341 | if (skb == NULL) { | ||
342 | pr_info("OOM: Try next frame in descriptor\n"); | ||
343 | break; | ||
344 | } | ||
341 | 345 | ||
342 | p = skb_put(skb, frm_pck_len); | 346 | p = skb_put(skb, frm_pck_len); |
343 | memcpy(p, pbuf->desc_vptr + frm_pck_ofs, frm_pck_len); | 347 | memcpy(p, pbuf->desc_vptr + frm_pck_ofs, frm_pck_len); |