* [PATCH] net/irda: fix error return code in bfin_sir_open()
@ 2013-05-07 12:14 Wei Yongjun
2013-05-08 20:14 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-05-07 12:14 UTC (permalink / raw)
To: samuel; +Cc: yongjun_wei, netdev
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/net/irda/bfin_sir.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index a06fca6..22b4527 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
@@ -609,7 +609,7 @@ static int bfin_sir_open(struct net_device *dev)
{
struct bfin_sir_self *self = netdev_priv(dev);
struct bfin_sir_port *port = self->sir_port;
- int err = -ENOMEM;
+ int err;
self->newspeed = 0;
self->speed = 9600;
@@ -623,8 +623,10 @@ static int bfin_sir_open(struct net_device *dev)
bfin_sir_set_speed(port, 9600);
self->irlap = irlap_open(dev, &self->qos, DRIVER_NAME);
- if (!self->irlap)
+ if (!self->irlap) {
+ err = -ENOMEM;
goto err_irlap;
+ }
INIT_WORK(&self->work, bfin_sir_send_work);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net/irda: fix error return code in bfin_sir_open()
2013-05-07 12:14 [PATCH] net/irda: fix error return code in bfin_sir_open() Wei Yongjun
@ 2013-05-08 20:14 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-05-08 20:14 UTC (permalink / raw)
To: weiyj.lk; +Cc: samuel, yongjun_wei, netdev
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Tue, 7 May 2013 20:14:33 +0800
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-08 20:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-07 12:14 [PATCH] net/irda: fix error return code in bfin_sir_open() Wei Yongjun
2013-05-08 20:14 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).