projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28ffd79
)
USB: mos7840: test and propagate set_uart_reg return value
author
Roel Kluin
<
[email protected]
>
Thu, 17 Apr 2008 04:16:24 +0000
(06:16 +0200)
committer
Greg Kroah-Hartman
<
[email protected]
>
Fri, 2 May 2008 17:25:53 +0000
(10:25 -0700)
The test for an mos7840_set_uart_reg() error return value only works when
status is signed. propagate its error value.
Signed-off-by: Roel Kluin <
[email protected]
>
Cc: SL Baur <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/usb/serial/mos7840.c
patch
|
blob
|
history
diff --git
a/drivers/usb/serial/mos7840.c
b/drivers/usb/serial/mos7840.c
index 6bcb82d3911a7baf386c0eda874cf3ea68ab1ba5..78f2f6db494d790fb4d00d75c0ef9c1229ef89ef 100644
(file)
--- a/
drivers/usb/serial/mos7840.c
+++ b/
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;