From: Jiri Slaby <jirislaby@gmail.com>

Value returned from kamlloc may be NULL, we should check if ENOMEM occured.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/isicom.c |    5 +++++
 1 files changed, 5 insertions(+)

diff -puN drivers/char/isicom.c~char-isicom-check-kmalloc-retval drivers/char/isicom.c
--- a/drivers/char/isicom.c~char-isicom-check-kmalloc-retval
+++ a/drivers/char/isicom.c
@@ -1708,6 +1708,11 @@ static int __devinit load_firmware(struc
 		}
 
 		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);
_