diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-09-22 17:07:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-26 16:55:35 -0700 |
| commit | 3428fc49229231eb8ac6940fc1ad30c572e1c96e (patch) | |
| tree | 4f6418ff5c0aec5c6ecc18814426bcbcaba3746f /drivers/staging/brcm80211/brcmfmac/dhd_common.c | |
| parent | bb7410b2fd325d889f674d2456ce953c519fb774 (diff) | |
| download | op-kernel-dev-3428fc49229231eb8ac6940fc1ad30c572e1c96e.zip op-kernel-dev-3428fc49229231eb8ac6940fc1ad30c572e1c96e.tar.gz | |
staging: brcm80211: removed log after kzalloc()/kmalloc() failure
kzalloc/kmalloc already reports an allocation failure themselves.
Reported-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/dhd_common.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 0c41c1c..963d1a9 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -562,10 +562,9 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable, struct brcmf_pkt_filter_enable *pkt_filterp; arg_save = kmalloc(strlen(arg) + 1, GFP_ATOMIC); - if (!arg_save) { - brcmf_dbg(ERROR, "kmalloc failed\n"); + if (!arg_save) goto fail; - } + arg_org = arg_save; memcpy(arg_save, arg, strlen(arg) + 1); @@ -635,18 +634,14 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) char *arg_save = NULL, *arg_org = NULL; arg_save = kstrdup(arg, GFP_ATOMIC); - if (!arg_save) { - brcmf_dbg(ERROR, "kmalloc failed\n"); + if (!arg_save) goto fail; - } arg_org = arg_save; buf = kmalloc(PKTFILTER_BUF_SIZE, GFP_ATOMIC); - if (!buf) { - brcmf_dbg(ERROR, "kmalloc failed\n"); + if (!buf) goto fail; - } argv[i] = strsep(&arg_save, " "); while (argv[i++]) |
