From 78c4b24089fa36f31db4ef8571f0bcd0e2d976da Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@shawell.net>
Date: Fri, 30 Nov 2012 05:55:48 +0000
Subject: [PATCH] --- yaml --- r: 341659 b: refs/heads/master c:
 eed9a72914a2b2737a0d91b80579f878999574ef h: refs/heads/master i:   341657:
 f29709e8c90a7a06df51a4e474922356c20ce2f6   341655:
 0f2ddd9121c1a2bbf986afe62c5cd8e41cf550c7 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/usb/smsc95xx.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bf4aa468c30..eb9bea1adf35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3c678e6d7484dc03fc36d3bfebb8ebb94574110
+refs/heads/master: eed9a72914a2b2737a0d91b80579f878999574ef
diff --git a/trunk/drivers/net/usb/smsc95xx.c b/trunk/drivers/net/usb/smsc95xx.c
index 79d495d15546..c397b3a04f10 100644
--- a/trunk/drivers/net/usb/smsc95xx.c
+++ b/trunk/drivers/net/usb/smsc95xx.c
@@ -1281,7 +1281,7 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
 	}
 
 	if (pdata->wolopts & (WAKE_BCAST | WAKE_MCAST | WAKE_ARP | WAKE_UCAST)) {
-		u32 *filter_mask = kzalloc(32, GFP_KERNEL);
+		u32 *filter_mask = kzalloc(sizeof(u32) * 32, GFP_KERNEL);
 		u32 command[2];
 		u32 offset[2];
 		u32 crc[4];
@@ -1290,6 +1290,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
 			LAN9500A_WUFF_NUM : LAN9500_WUFF_NUM;
 		int i, filter = 0;
 
+		if (!filter_mask) {
+			netdev_warn(dev->net, "Unable to allocate filter_mask\n");
+			return -ENOMEM;
+		}
+
 		memset(command, 0, sizeof(command));
 		memset(offset, 0, sizeof(offset));
 		memset(crc, 0, sizeof(crc));