drivers/char/synclink.c: unbreak mgsl_put_char()
Repair the effects of
commit 55da77899c
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:07 2008 -0700
synclink series: switch to int put_char method
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
drivers/char/synclink_gt.c: In function 'put_char':
drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
and do some whitespace repair and unneeded-cast-removal in there as well.
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
24c03d47d0
commit
076482307f
1 changed files with 8 additions and 8 deletions
|
@ -2028,13 +2028,13 @@ static void mgsl_change_params(struct mgsl_struct *info)
|
||||||
*/
|
*/
|
||||||
static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
|
static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
|
||||||
{
|
{
|
||||||
struct mgsl_struct *info = (struct mgsl_struct *)tty->driver_data;
|
struct mgsl_struct *info = tty->driver_data;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int ret;
|
int ret = 0;
|
||||||
|
|
||||||
if ( debug_level >= DEBUG_LEVEL_INFO ) {
|
if (debug_level >= DEBUG_LEVEL_INFO) {
|
||||||
printk( "%s(%d):mgsl_put_char(%d) on %s\n",
|
printk("%s(%d):mgsl_put_char(%d) on %s\n",
|
||||||
__FILE__,__LINE__,ch,info->device_name);
|
__FILE__, __LINE__, ch, info->device_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mgsl_paranoia_check(info, tty->name, "mgsl_put_char"))
|
if (mgsl_paranoia_check(info, tty->name, "mgsl_put_char"))
|
||||||
|
@ -2043,9 +2043,9 @@ static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
|
||||||
if (!tty || !info->xmit_buf)
|
if (!tty || !info->xmit_buf)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&info->irq_spinlock,flags);
|
spin_lock_irqsave(&info->irq_spinlock, flags);
|
||||||
|
|
||||||
if ( (info->params.mode == MGSL_MODE_ASYNC ) || !info->tx_active ) {
|
if ((info->params.mode == MGSL_MODE_ASYNC ) || !info->tx_active) {
|
||||||
if (info->xmit_cnt < SERIAL_XMIT_SIZE - 1) {
|
if (info->xmit_cnt < SERIAL_XMIT_SIZE - 1) {
|
||||||
info->xmit_buf[info->xmit_head++] = ch;
|
info->xmit_buf[info->xmit_head++] = ch;
|
||||||
info->xmit_head &= SERIAL_XMIT_SIZE-1;
|
info->xmit_head &= SERIAL_XMIT_SIZE-1;
|
||||||
|
@ -2053,7 +2053,7 @@ static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
|
||||||
ret = 1;
|
ret = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&info->irq_spinlock,flags);
|
spin_unlock_irqrestore(&info->irq_spinlock, flags);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
} /* end of mgsl_put_char() */
|
} /* end of mgsl_put_char() */
|
||||||
|
|
Reference in a new issue