forked from luck/tmp_suning_uos_patched
tty: synclinkmp.c: move assignment out of if () block
We should not be doing assignments within an if () block so fix up the code to not do this. change was created using Coccinelle. CC: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3236133efe
commit
485e148d11
|
@ -1655,7 +1655,8 @@ static int hdlcdev_open(struct net_device *dev)
|
|||
printk("%s:hdlcdev_open(%s)\n",__FILE__,dev->name);
|
||||
|
||||
/* generic HDLC layer open processing */
|
||||
if ((rc = hdlc_open(dev)))
|
||||
rc = hdlc_open(dev);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
/* arbitrate between network and tty opens */
|
||||
|
@ -1922,7 +1923,8 @@ static int hdlcdev_init(SLMP_INFO *info)
|
|||
|
||||
/* allocate and initialize network and HDLC layer objects */
|
||||
|
||||
if (!(dev = alloc_hdlcdev(info))) {
|
||||
dev = alloc_hdlcdev(info);
|
||||
if (!dev) {
|
||||
printk(KERN_ERR "%s:hdlc device allocation failure\n",__FILE__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
@ -1943,7 +1945,8 @@ static int hdlcdev_init(SLMP_INFO *info)
|
|||
hdlc->xmit = hdlcdev_xmit;
|
||||
|
||||
/* register objects with HDLC layer */
|
||||
if ((rc = register_hdlc_device(dev))) {
|
||||
rc = register_hdlc_device(dev);
|
||||
if (rc) {
|
||||
printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__);
|
||||
free_netdev(dev);
|
||||
return rc;
|
||||
|
@ -3920,7 +3923,8 @@ static void synclinkmp_cleanup(void)
|
|||
printk("Unloading %s %s\n", driver_name, driver_version);
|
||||
|
||||
if (serial_driver) {
|
||||
if ((rc = tty_unregister_driver(serial_driver)))
|
||||
rc = tty_unregister_driver(serial_driver);
|
||||
if (rc)
|
||||
printk("%s(%d) failed to unregister tty driver err=%d\n",
|
||||
__FILE__,__LINE__,rc);
|
||||
put_tty_driver(serial_driver);
|
||||
|
|
Loading…
Reference in New Issue
Block a user