]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: wilc1000: wilc_frmw_to_linux(): fixes null check
authorLeo Kim <leo.kim@atmel.com>
Wed, 27 Jan 2016 02:50:25 +0000 (11:50 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:28:21 +0000 (15:28 -0800)
Null checking wilc_netdev and skb->dev are already done in the begining of the
function and they are just print printing error log, so delete them.
Null checking wilc is needed before is used so add null ckeck before it is
used.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index 2489ea30855ca2ff86a3fda05ded5f51c49f39f6..505b1233386c1cc51078f63977603346e33404c9 100644 (file)
@@ -1322,6 +1322,9 @@ void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset)
        struct net_device *wilc_netdev;
        struct wilc_vif *vif;
 
+       if (!wilc)
+               return;
+
        wilc_netdev = get_if_handler(wilc, buff);
        if (!wilc_netdev)
                return;
@@ -1338,14 +1341,8 @@ void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset)
                        PRINT_ER("Low memory - packet droped\n");
                        return;
                }
-
-               if (!wilc || !wilc_netdev)
-                       PRINT_ER("wilc_netdev in wilc is NULL");
                skb->dev = wilc_netdev;
 
-               if (!skb->dev)
-                       PRINT_ER("skb->dev is NULL\n");
-
                memcpy(skb_put(skb, frame_len), buff_to_send, frame_len);
 
                skb->protocol = eth_type_trans(skb, wilc_netdev);