From c28d82527c00f4282cde5051e7ed55b7e669e982 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Thu, 17 Apr 2008 06:16:24 +0200
Subject: [PATCH] --- yaml --- r: 95787 b: refs/heads/master c:
 87521c46f63f0e1cac2bf8af08942ac47bb25de5 h: refs/heads/master i:   95785:
 ea504dd24e3ba1cf830fda386b5b596b8d9b45f1   95783:
 96464ce5455afb3189ab57c3eb049df596fb7570 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/serial/mos7840.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 949cbcbfa8cc..305b534fb8e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28ffd79c31a7bed6f610511a4d104d1255cd1d95
+refs/heads/master: 87521c46f63f0e1cac2bf8af08942ac47bb25de5
diff --git a/trunk/drivers/usb/serial/mos7840.c b/trunk/drivers/usb/serial/mos7840.c
index 6bcb82d3911a..78f2f6db494d 100644
--- a/trunk/drivers/usb/serial/mos7840.c
+++ b/trunk/drivers/usb/serial/mos7840.c
@@ -1713,7 +1713,7 @@ static int mos7840_tiocmset(struct usb_serial_port *port, struct file *file,
 {
 	struct moschip_port *mos7840_port;
 	unsigned int mcr;
-	unsigned int status;
+	int status;
 
 	dbg("%s - port %d", __func__, port->number);
 
@@ -1740,11 +1740,10 @@ static int mos7840_tiocmset(struct usb_serial_port *port, struct file *file,
 
 	mos7840_port->shadowMCR = mcr;
 
-	status = 0;
 	status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, mcr);
 	if (status < 0) {
 		dbg("setting MODEM_CONTROL_REGISTER Failed\n");
-		return -1;
+		return status;
 	}
 
 	return 0;