diff options
| author | Roar Førde <roar.forde@stericsson.com> | 2011-12-06 12:15:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-06 17:21:47 -0500 |
| commit | f84ea779c25dabc90956f1c329e5e5c501ea96cc (patch) | |
| tree | 8a66cb38fb4f7d04bf5a1c3405c73802eaac0614 /net/caif | |
| parent | 095d2a71e51bd2a3e476232156e8d9c2dbc0596d (diff) | |
| download | linux-stable-f84ea779c25dabc90956f1c329e5e5c501ea96cc.tar.gz linux-stable-f84ea779c25dabc90956f1c329e5e5c501ea96cc.tar.bz2 linux-stable-f84ea779c25dabc90956f1c329e5e5c501ea96cc.zip | |
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 'net/caif')
| -rw-r--r-- | net/caif/caif_dev.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 9b298c14028d..b0ce14fbf6ef 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c @@ -58,7 +58,6 @@ static int q_high = 50; /* Percent */ struct cfcnfg *get_cfcnfg(struct net *net) { struct caif_net *caifn; - BUG_ON(!net); caifn = net_generic(net, caif_net_id); if (!caifn) return NULL; @@ -69,7 +68,6 @@ EXPORT_SYMBOL(get_cfcnfg); static struct caif_device_entry_list *caif_device_list(struct net *net) { struct caif_net *caifn; - BUG_ON(!net); caifn = net_generic(net, caif_net_id); if (!caifn) return NULL; @@ -507,15 +505,15 @@ static struct notifier_block caif_device_notifier = { static int caif_init_net(struct net *net) { struct caif_net *caifn = net_generic(net, caif_net_id); - BUG_ON(!caifn); + if (WARN_ON(!caifn)) + return -EINVAL; + INIT_LIST_HEAD(&caifn->caifdevs.list); mutex_init(&caifn->caifdevs.lock); caifn->cfg = cfcnfg_create(); - if (!caifn->cfg) { - pr_warn("can't create cfcnfg\n"); + if (!caifn->cfg) return -ENOMEM; - } return 0; } |