diff --git a/[refs] b/[refs]
index 740f021c9bca..96c715a40807 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 277ac73720628f032c34c1e8b157a6ae2077766f
+refs/heads/master: 310c6a762e224ae38efac304c936b82ad89a4ff1
diff --git a/trunk/drivers/staging/wlags49_h2/wl_netdev.c b/trunk/drivers/staging/wlags49_h2/wl_netdev.c
index 90820ff1aced..6a44cb87bdf6 100644
--- a/trunk/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/trunk/drivers/staging/wlags49_h2/wl_netdev.c
@@ -1510,8 +1510,11 @@ void wl_wds_device_alloc( struct wl_private *lp )
     for( count = 0; count < NUM_WDS_PORTS; count++ ) {
         struct net_device *dev_wds = NULL;
 
-        dev_wds = kmalloc( sizeof( struct net_device ), GFP_KERNEL );
-        memset( dev_wds, 0, sizeof( struct net_device ));
+	dev_wds = kzalloc(sizeof(struct net_device), GFP_KERNEL);
+	if (!dev_wds) {
+		DBG_LEAVE(DbgInfo);
+		return;
+	}
 
         ether_setup( dev_wds );