From 24607699e8f96ec3a8b0420a0bda6e44c3014243 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:54:04 -0700 Subject: [PATCH] --- yaml --- r: 95223 b: refs/heads/master c: d7e752e2757fba49178f4b1af4778ca64d305cbb h: refs/heads/master i: 95221: e8c7ccaad5dc5e1cb4eebb5bacefabb3c17c7cfb 95219: 931c3b70509a79dca0997a963435e8b36b5d56ff 95215: f7a56a73550ecf235fbf417c5110f134bca45261 v: v3 --- [refs] | 2 +- trunk/drivers/char/pcmcia/synclink_cs.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 857be8096768..156efc7289e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5 +refs/heads/master: d7e752e2757fba49178f4b1af4778ca64d305cbb diff --git a/trunk/drivers/char/pcmcia/synclink_cs.c b/trunk/drivers/char/pcmcia/synclink_cs.c index 45d8eb5de69f..1dd0e992c83d 100644 --- a/trunk/drivers/char/pcmcia/synclink_cs.c +++ b/trunk/drivers/char/pcmcia/synclink_cs.c @@ -1545,7 +1545,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info) /* Add a character to the transmit buffer */ -static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) +static int mgslpc_put_char(struct tty_struct *tty, unsigned char ch) { MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; unsigned long flags; @@ -1556,10 +1556,10 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) } if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char")) - return; + return 0; if (!info->tx_buf) - return; + return 0; spin_lock_irqsave(&info->lock,flags); @@ -1572,6 +1572,7 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) } spin_unlock_irqrestore(&info->lock,flags); + return 1; } /* Enable transmitter so remaining characters in the