diff --git a/[refs] b/[refs]
index ac79bcacdc6c..6e5bd8176926 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78028da91e05146c9ce0c9db2fea53e0cded1e81
+refs/heads/master: f0671378426d9768bf20d5e0f8389374dcdc2abf
diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c
index 91b978445229..783a7ec0a8e6 100644
--- a/trunk/drivers/char/isicom.c
+++ b/trunk/drivers/char/isicom.c
@@ -1709,6 +1709,11 @@ static int __devinit load_firmware(struct pci_dev *pdev,
 		}
 
 		data = kmalloc(word_count * 2, GFP_KERNEL);
+		if (data == NULL) {
+			dev_err(&pdev->dev, "Card%d, firmware upload "
+				"failed, not enough memory\n", index + 1);
+			goto errrelfw;
+		}
 		inw(base);
 		insw(base, data, word_count);
 		InterruptTheCard(base);