Hi David, On Mon, Oct 24, 2011 at 3:30 PM, David Herrmann <dh.herrmann@xxxxxxxxxxxxxx> wrote: > Forward error codes from tty core to the rfcomm_init caller instead of using > generic -1 errors. > > Signed-off-by: David Herrmann <dh.herrmann@xxxxxxxxxxxxxx> > --- > net/bluetooth/rfcomm/tty.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c > index c258796..2b753a3 100644 > --- a/net/bluetooth/rfcomm/tty.c > +++ b/net/bluetooth/rfcomm/tty.c > @@ -1155,9 +1155,11 @@ static const struct tty_operations rfcomm_ops = { > > int __init rfcomm_init_ttys(void) > { > + int error; > + > rfcomm_tty_driver = alloc_tty_driver(RFCOMM_TTY_PORTS); > if (!rfcomm_tty_driver) > - return -1; > + return -ENOMEM; > > rfcomm_tty_driver->owner = THIS_MODULE; > rfcomm_tty_driver->driver_name = "rfcomm"; > @@ -1172,10 +1174,11 @@ int __init rfcomm_init_ttys(void) > rfcomm_tty_driver->init_termios.c_lflag &= ~ICANON; > tty_set_operations(rfcomm_tty_driver, &rfcomm_ops); > > - if (tty_register_driver(rfcomm_tty_driver)) { > + error = tty_register_driver(rfcomm_tty_driver); > + if (error) { > BT_ERR("Can't register RFCOMM TTY driver"); > put_tty_driver(rfcomm_tty_driver); > - return -1; > + return error; Since you are defining a new variable (error), how about use it on other error paths and add a "goto out" and have just one return path? Regards, Anderson Briglia > } > > BT_INFO("RFCOMM TTY layer initialized"); > -- > 1.7.7 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- INdT - Instituto Nokia de tecnologia +55 92 2126 1122 +55 92 8423 3183 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html