From f97b1837b3045ab5870f56160c1c86d007997cf3 Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Tue, 24 Jul 2012 07:49:42 -0700 Subject: [PATCH] --- yaml --- r: 324499 b: refs/heads/master c: 472aba5f91fd6413c9c75e71366f133aa8c7f2f2 h: refs/heads/master i: 324497: b4e3ab64c14c77f425ee6fe5380338112de94eed 324495: a5e26b12ca16bec40a458dccd8c3718e2a38d2e4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/gdm72xx/gdm_wimax.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6ff1a4a030f3..5806e7899934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c1669d8a7b771cec1013cbfb5a7d390464c1d53 +refs/heads/master: 472aba5f91fd6413c9c75e71366f133aa8c7f2f2 diff --git a/trunk/drivers/staging/gdm72xx/gdm_wimax.c b/trunk/drivers/staging/gdm72xx/gdm_wimax.c index 0716efc1817d..6cb810701a3e 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_wimax.c +++ b/trunk/drivers/staging/gdm72xx/gdm_wimax.c @@ -258,12 +258,16 @@ static int gdm_wimax_event_init(void) if (!wm_event.ref_cnt) { wm_event.sock = netlink_init(NETLINK_WIMAX, gdm_wimax_event_rcv); - if (wm_event.sock) - wm_event.ref_cnt++; - INIT_LIST_HEAD(&wm_event.evtq); - INIT_LIST_HEAD(&wm_event.freeq); - INIT_WORK(&wm_event.ws, __gdm_wimax_event_send); - spin_lock_init(&wm_event.evt_lock); + if (wm_event.sock) { + INIT_LIST_HEAD(&wm_event.evtq); + INIT_LIST_HEAD(&wm_event.freeq); + INIT_WORK(&wm_event.ws, __gdm_wimax_event_send); + spin_lock_init(&wm_event.evt_lock); + } + } + + if (wm_event.sock) { + wm_event.ref_cnt++; return 0; }