UPSTREAM: staging/gdm72xx: cleanup little at gdm_wimax_event_rcv
authorDevendra Naga <devendra.aaru@gmail.com>
Thu, 12 Jul 2012 06:12:25 +0000 (11:57 +0545)
committerGerrit <chrome-bot@google.com>
Fri, 17 Aug 2012 01:18:28 +0000 (18:18 -0700)
the event sock check is done at the netlink_init itself.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 8df858ea76b76dde9a39d4edd9aaded983582cfe)

Change-Id: I8ef8a42bdd6ac462211344371174a20d28b049a9
Reviewed-on: https://gerrit.chromium.org/gerrit/30132
Reviewed-by: Olof Johansson <olofj@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
drivers/staging/gdm72xx/gdm_wimax.c

index e616de1..0716efc 100644 (file)
@@ -255,17 +255,15 @@ static void gdm_wimax_event_rcv(struct net_device *dev, u16 type, void *msg,
 
 static int gdm_wimax_event_init(void)
 {
-       if (wm_event.ref_cnt == 0) {
+       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) {
-               wm_event.ref_cnt++;
                return 0;
        }