Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268244
b: refs/heads/master
c: 7e9f621
h: refs/heads/master
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 6092939 commit 3cce1be
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e6b8641f45bd79dbc26931972431c4697686472d
refs/heads/master: 7e9f621cb958fb4d2a8ba922465b2be699b7eeb0
8 changes: 4 additions & 4 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable,
const char *str;
int buf_len;
int str_len;
char *arg_save = 0, *arg_org = 0;
char *arg_save = NULL, *arg_org = NULL;
int rc;
char buf[128];
struct brcmf_pkt_filter_enable enable_parm;
Expand Down Expand Up @@ -915,9 +915,9 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
int rc;
u32 mask_size;
u32 pattern_size;
char *argv[8], *buf = 0;
char *argv[8], *buf = NULL;
int i = 0;
char *arg_save = 0, *arg_org = 0;
char *arg_save = NULL, *arg_org = NULL;

arg_save = kstrdup(arg, GFP_ATOMIC);
if (!arg_save) {
Expand Down Expand Up @@ -1099,7 +1099,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
/* query for 'ver' to get version info from firmware */
memset(buf, 0, sizeof(buf));
ptr = buf;
brcmu_mkiovar("ver", 0, 0, buf, sizeof(buf));
brcmu_mkiovar("ver", NULL, 0, buf, sizeof(buf));
brcmf_proto_cdc_query_ioctl(drvr, 0, BRCMF_C_GET_VAR, buf, sizeof(buf));
strsep(&ptr, "\n");
/* Print fw version info */
Expand Down

0 comments on commit 3cce1be

Please sign in to comment.