Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104687
b: refs/heads/master
c: d76f2f4
h: refs/heads/master
i:
  104685: b4dbe37
  104683: 312cb17
  104679: 72bad26
  104671: 8534cf0
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Jul 22, 2008
1 parent 7aa9cb0 commit 1d2897d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 03f0dbf74c7a117c270e63d62d5e4927af6f295b
refs/heads/master: d76f2f4462bbb2cf7bc83a35c5278177aa627e89
12 changes: 6 additions & 6 deletions trunk/drivers/usb/serial/io_edgeport.c
Original file line number Diff line number Diff line change
Expand Up @@ -1404,15 +1404,15 @@ static int edge_write_room(struct tty_struct *tty)
dbg("%s", __func__);

if (edge_port == NULL)
return -ENODEV;
return 0;
if (edge_port->closePending)
return -ENODEV;
return 0;

dbg("%s - port %d", __func__, port->number);

if (!edge_port->open) {
dbg("%s - port not opened", __func__);
return -EINVAL;
return 0;
}

/* total of both buffers is still txCredit */
Expand Down Expand Up @@ -1444,13 +1444,13 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
dbg("%s", __func__);

if (edge_port == NULL)
return -ENODEV;
return 0;
if (edge_port->closePending)
return -ENODEV;
return 0;

if (!edge_port->open) {
dbg("%s - port not opened", __func__);
return -EINVAL;
return 0;
}

spin_lock_irqsave(&edge_port->ep_lock, flags);
Expand Down

0 comments on commit 1d2897d

Please sign in to comment.