Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104698
b: refs/heads/master
c: 4a56122
h: refs/heads/master
v: v3
  • Loading branch information
David Howells authored and Linus Torvalds committed Jul 22, 2008
1 parent 76e98a5 commit 7c939b0
Show file tree
Hide file tree
Showing 2 changed files with 10 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: 781cff5cb2bc8d714270accf88db23a855de9816
refs/heads/master: 4a56122297ac7a4a3bf09fb66c0a365a13abe707
16 changes: 9 additions & 7 deletions trunk/drivers/char/stallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count

/*****************************************************************************/

static void stl_putchar(struct tty_struct *tty, unsigned char ch)
static int stl_putchar(struct tty_struct *tty, unsigned char ch)
{
struct stlport *portp;
unsigned int len;
Expand All @@ -1034,12 +1034,12 @@ static void stl_putchar(struct tty_struct *tty, unsigned char ch)
pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch);

if (tty == NULL)
return;
return -EINVAL;
portp = tty->driver_data;
if (portp == NULL)
return;
return -EINVAL;
if (portp->tx.buf == NULL)
return;
return -EINVAL;

head = portp->tx.head;
tail = portp->tx.tail;
Expand All @@ -1053,6 +1053,7 @@ static void stl_putchar(struct tty_struct *tty, unsigned char ch)
head = portp->tx.buf;
}
portp->tx.head = head;
return 0;
}

/*****************************************************************************/
Expand Down Expand Up @@ -1460,19 +1461,20 @@ static void stl_hangup(struct tty_struct *tty)

/*****************************************************************************/

static void stl_breakctl(struct tty_struct *tty, int state)
static int stl_breakctl(struct tty_struct *tty, int state)
{
struct stlport *portp;

pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state);

if (tty == NULL)
return;
return -EINVAL;
portp = tty->driver_data;
if (portp == NULL)
return;
return -EINVAL;

stl_sendbreak(portp, ((state == -1) ? 1 : 2));
return 0;
}

/*****************************************************************************/
Expand Down

0 comments on commit 7c939b0

Please sign in to comment.