mct_u232: Fix incorrect TIOCMSET return

PATCH New Alan Cox 1 participant 1 message May 22, 2012

Subsystems (3)

USB TTY layer and serial drivers USB serial

lore

Share & tools

lore

Alan Cox

author

2012-05-22 19:45 UTC #0 lore raw

PATCH 1/1 mct_u232: Fix incorrect TIOCMSET return

From: Alan Cox <alan-VuQAYsv1563Yd54FQh9/[email protected]>

The low level helper returns 1 on success. The ioctl should however return
0. As this is the only user of the helper return, make the helper return 0 or an error code.

Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43009

Signed-off-by Alan Cox <alan-VuQAYsv1563Yd54FQh9/[email protected]>

---

 drivers/usb/serial/mct_u232.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

drivers/usb/serial/mct_u232.c +8 -5

index d0ec1aa..a71fa0a 100644
@@ -309,13 +309,16 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
 			MCT_U232_SET_REQUEST_TYPE,
 			0, 0, buf, MCT_U232_SET_MODEM_CTRL_SIZE,
 			WDR_TIMEOUT);
-	if (rc < 0)
-		dev_err(&serial->dev->dev,
-			"Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
+	kfree(buf);
+
 	dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
 
-	kfree(buf);
-	return rc;
+	if (rc < 0) {
+		dev_err(&serial->dev->dev,
+			"Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
+		return rc;
+	}
+	return 0;
 } /* mct_u232_set_modem_ctrl */
 
 static int mct_u232_get_modem_stat(struct usb_serial *serial,

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html