Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326029
b: refs/heads/master
c: 7b5ba27
h: refs/heads/master
i:
  326027: c68aa27
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 14, 2012
1 parent 8a48464 commit e3eb3e3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e00609d857962ebecfba7deab834a52087b2454
refs/heads/master: 7b5ba275dfa8858e66aad8641874cf88c1ed0651
14 changes: 7 additions & 7 deletions trunk/drivers/usb/serial/omninet.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ static void omninet_read_bulk_callback(struct urb *urb)
int i;

if (status) {
dbg("%s - nonzero read bulk status received: %d",
__func__, status);
dev_dbg(&port->dev, "%s - nonzero read bulk status received: %d\n",
__func__, status);
return;
}

Expand Down Expand Up @@ -212,12 +212,12 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
int result;

if (count == 0) {
dbg("%s - write request of 0 bytes", __func__);
dev_dbg(&port->dev, "%s - write request of 0 bytes\n", __func__);
return 0;
}

if (!test_and_clear_bit(0, &port->write_urbs_free)) {
dbg("%s - already writing", __func__);
dev_dbg(&port->dev, "%s - already writing\n", __func__);
return 0;
}

Expand Down Expand Up @@ -261,7 +261,7 @@ static int omninet_write_room(struct tty_struct *tty)
if (test_bit(0, &wport->write_urbs_free))
room = wport->bulk_out_size - OMNINET_HEADERLEN;

dbg("%s - returns %d", __func__, room);
dev_dbg(&port->dev, "%s - returns %d\n", __func__, room);

return room;
}
Expand All @@ -275,8 +275,8 @@ static void omninet_write_bulk_callback(struct urb *urb)

set_bit(0, &port->write_urbs_free);
if (status) {
dbg("%s - nonzero write bulk status received: %d",
__func__, status);
dev_dbg(&port->dev, "%s - nonzero write bulk status received: %d\n",
__func__, status);
return;
}

Expand Down

0 comments on commit e3eb3e3

Please sign in to comment.