Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29767
b: refs/heads/master
c: 969dd06
h: refs/heads/master
i:
  29765: d4df6f1
  29763: 5ae9ac5
  29759: 606f610
v: v3
  • Loading branch information
Eric Sesterhenn authored and Linus Torvalds committed Jun 25, 2006
1 parent a91e92f commit 0eb21dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: 2aa92581fb13e04e1440e5041b412cc06c782e0e
refs/heads/master: 969dd061d81d9e2bc7f954859452ac81cc639711
7 changes: 3 additions & 4 deletions trunk/drivers/char/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -2833,9 +2833,8 @@ cy_write(struct tty_struct * tty, const unsigned char *buf, int count)
return 0;
}

if (!tty || !info->xmit_buf || !tmp_buf){
return 0;
}
if (!info->xmit_buf || !tmp_buf)
return 0;

CY_LOCK(info, flags);
while (1) {
Expand Down Expand Up @@ -2884,7 +2883,7 @@ cy_put_char(struct tty_struct *tty, unsigned char ch)
if (serial_paranoia_check(info, tty->name, "cy_put_char"))
return;

if (!tty || !info->xmit_buf)
if (!info->xmit_buf)
return;

CY_LOCK(info, flags);
Expand Down

0 comments on commit 0eb21dd

Please sign in to comment.