Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a6ffa8 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

serial m68k: put_char returns 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9e7c9a19

drivers/serial/68328serial.c

+2 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void rs_stop(struct tty_struct *tty) 
	local_irq_restore(flags);

}



static void rs_put_char(char ch)

static int rs_put_char(char ch)

{

        int flags, loops = 0;
@@ -214,6 +214,7 @@ static void rs_put_char(char ch) 
	UTX_TXDATA = ch;

        udelay(5);

        local_irq_restore(flags);

        return 1;

}



static void rs_start(struct tty_struct *tty)

drivers/serial/68360serial.c

+3 −2
Original line number Diff line number Diff line
@@ -995,10 +995,10 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) 
	volatile QUICC_BD	*bdp;



	if (serial_paranoia_check(info, tty->name, "rs_put_char"))

		return;

		return 0;



	if (!tty)

		return;

		return 0;



	bdp = info->tx_cur;

	while (bdp->status & BD_SC_READY);
@@ -1016,6 +1016,7 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) 
		bdp++;



	info->tx_cur = (QUICC_BD *)bdp;

	return 1;



}

drivers/serial/mcfserial.c

+2 −2
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ static struct tty_driver *mcfrs_console_device(struct console *c, int *index) 
 *	This is used for console output.

 */



void mcfrs_put_char(char ch)

int mcfrs_put_char(char ch)

{

	volatile unsigned char	*uartp;

	unsigned long		flags;
@@ -1921,7 +1921,7 @@ void mcfrs_put_char(char ch) 
		mcfrs_init_console(); /* try and get it back */

	local_irq_restore(flags);



	return;

	return 1;

}