Commit 59b626e1 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller

net/irda: fix error return code in bfin_sir_open()

Fix to return -ENOMEM in the irlap_open() error handling case instead
of 0(overwrite to 0 by bfin_sir_startup()), as done elsewhere in this
function.
Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 058112c7
...@@ -609,7 +609,7 @@ static int bfin_sir_open(struct net_device *dev) ...@@ -609,7 +609,7 @@ static int bfin_sir_open(struct net_device *dev)
{ {
struct bfin_sir_self *self = netdev_priv(dev); struct bfin_sir_self *self = netdev_priv(dev);
struct bfin_sir_port *port = self->sir_port; struct bfin_sir_port *port = self->sir_port;
int err = -ENOMEM; int err;
self->newspeed = 0; self->newspeed = 0;
self->speed = 9600; self->speed = 9600;
...@@ -623,8 +623,10 @@ static int bfin_sir_open(struct net_device *dev) ...@@ -623,8 +623,10 @@ static int bfin_sir_open(struct net_device *dev)
bfin_sir_set_speed(port, 9600); bfin_sir_set_speed(port, 9600);
self->irlap = irlap_open(dev, &self->qos, DRIVER_NAME); self->irlap = irlap_open(dev, &self->qos, DRIVER_NAME);
if (!self->irlap) if (!self->irlap) {
err = -ENOMEM;
goto err_irlap; goto err_irlap;
}
INIT_WORK(&self->work, bfin_sir_send_work); INIT_WORK(&self->work, bfin_sir_send_work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment