From 5cb7941b9a0ac6ee57a9f6f865431020fe0329ce Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Mon, 28 Dec 2009 23:01:56 +0100
Subject: [PATCH] --- yaml --- r: 185303 b: refs/heads/master c:
 d2126326bd71b56fcaa5e86474433d11e253f84d h: refs/heads/master i:   185301:
 eec58811104173b6d3ab06ee18e392cbb36a9f64   185299:
 aee9dab1ee54dcb16e5ccf619789b43b1b69c8c6   185295:
 fc593f7ffea16774f513fdf7d51acad2e3e58c31 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/serial/oti6858.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b6073b04af08..38f79241664b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e221a35f82cbef0397d81fed588bafba95b550c
+refs/heads/master: d2126326bd71b56fcaa5e86474433d11e253f84d
diff --git a/trunk/drivers/usb/serial/oti6858.c b/trunk/drivers/usb/serial/oti6858.c
index c644e26394b4..2ae97e7195c6 100644
--- a/trunk/drivers/usb/serial/oti6858.c
+++ b/trunk/drivers/usb/serial/oti6858.c
@@ -302,7 +302,7 @@ void send_data(struct work_struct *work)
 	struct usb_serial_port *port = priv->port;
 	int count = 0, result;
 	unsigned long flags;
-	unsigned char allow;
+	u8 *allow;
 
 	dbg("%s(port = %d)", __func__, port->number);
 
@@ -321,13 +321,20 @@ void send_data(struct work_struct *work)
 		count = port->bulk_out_size;
 
 	if (count != 0) {
+		allow = kmalloc(1, GFP_KERNEL);
+		if (!allow) {
+			dev_err(&port->dev, "%s(): kmalloc failed\n",
+					__func__);
+			return;
+		}
 		result = usb_control_msg(port->serial->dev,
 				usb_rcvctrlpipe(port->serial->dev, 0),
 				OTI6858_REQ_T_CHECK_TXBUFF,
 				OTI6858_REQ_CHECK_TXBUFF,
-				count, 0, &allow, 1, 100);
-		if (result != 1 || allow != 0)
+				count, 0, allow, 1, 100);
+		if (result != 1 || *allow != 0)
 			count = 0;
+		kfree(allow);
 	}
 
 	if (count == 0) {