block: use bio_has_data() to check for data carrying bio

[linux-2.6-omap-h63xx.git] / drivers / serial / sn_console.c

diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 41fc61264443578e77fc4deb16ef276c79d2d502..b73e3c0056cd77531248a89dc2925809e61faae6 100644 (file)
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -471,7 +471,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 
        if (port->sc_port.info) {
                /* The serial_core stuffs are initilized, use them */
-               tty = port->sc_port.info->tty;
+               tty = port->sc_port.info->port.tty;
        }
        else {
                /* Not registered yet - can't pass to tty layer.  */
@@ -839,7 +839,7 @@ static int __init sn_sal_module_init(void)
 
        if (uart_add_one_port(&sal_console_uart, &sal_console_port.sc_port) < 0) {
                /* error - not sure what I'd do - so I'll do nothing */
-               printk(KERN_ERR "%s: unable to add port\n", __FUNCTION__);
+               printk(KERN_ERR "%s: unable to add port\n", __func__);
        }
 
        /* when this driver is compiled in, the console initialization