From 2ac1c6c27689f3c82dd9d291b1de90cafa0a01a6 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Wed, 30 Apr 2008 00:54:17 -0700
Subject: [PATCH] --- yaml --- r: 95239 b: refs/heads/master c:
 8cd64518a3d166a21f5c69ac7860b3add0369dd0 h: refs/heads/master i:   95237:
 f28590365dd8a62102a9fcba272c46de37cbd8d0   95235:
 9ea75fa958accef41a2b038fdd86f314a4e01836   95231:
 9386f16a900b48ccfbf7eb4fee02dc3edbd9a88c v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/char/isicom.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f4f1e0109fea..d4af423de563 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb100b6ea7bf8a95e52b90cc0dc0ea5744a0a40a
+refs/heads/master: 8cd64518a3d166a21f5c69ac7860b3add0369dd0
diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c
index 9c6be8da220c..4f3cefa8eb0e 100644
--- a/trunk/drivers/char/isicom.c
+++ b/trunk/drivers/char/isicom.c
@@ -813,15 +813,13 @@ static int isicom_setup_port(struct isi_port *port)
 		return 0;
 	if (!port->xmit_buf) {
 		/* Relies on BKL */
-		void *xmit_buf = (void *)get_zeroed_page(GFP_KERNEL);
-
-		if (xmit_buf == NULL)
+		unsigned long page  = get_zeroed_page(GFP_KERNEL);
+		if (page == 0)
 			return -ENOMEM;
-		if (port->xmit_buf) {
-			free_page((unsigned long)xmit_buf);
-			return -ERESTARTSYS;
-		}
-		port->xmit_buf = xmit_buf;
+		if (port->xmit_buf)
+			free_page(page);
+		else
+			port->xmit_buf = (unsigned char *) page;
 	}
 
 	spin_lock_irqsave(&card->card_lock, flags);