diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-25 11:29:05 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-05-15 16:15:57 +0200 |
| commit | c8c18883ba8b8c7f2d9d463c8cf948b944e3c2df (patch) | |
| tree | e9cb317e0f10d17254f53ad74a1e9de16c4a2cf8 /drivers/usb/gadget/zero.c | |
| parent | Linux 3.10-rc1 (diff) | |
| download | linux-c8c18883ba8b8c7f2d9d463c8cf948b944e3c2df.tar.xz linux-c8c18883ba8b8c7f2d9d463c8cf948b944e3c2df.zip | |
usb: gadget: zero: fix error return code in zero_bind()
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Introduced by commit cf9a08ae5aece88987bbeee8eb0dd0ebb5015815
(usb: gadget: convert source sink and loopback to new function interface)
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/zero.c')
| -rw-r--r-- | drivers/usb/gadget/zero.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 2cd6262e8b71..0deb9d6cde26 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c @@ -284,12 +284,16 @@ static int __init zero_bind(struct usb_composite_dev *cdev) ss_opts->bulk_buflen = gzero_options.bulk_buflen; func_ss = usb_get_function(func_inst_ss); - if (IS_ERR(func_ss)) + if (IS_ERR(func_ss)) { + status = PTR_ERR(func_ss); goto err_put_func_inst_ss; + } func_inst_lb = usb_get_function_instance("Loopback"); - if (IS_ERR(func_inst_lb)) + if (IS_ERR(func_inst_lb)) { + status = PTR_ERR(func_inst_lb); goto err_put_func_ss; + } lb_opts = container_of(func_inst_lb, struct f_lb_opts, func_inst); lb_opts->bulk_buflen = gzero_options.bulk_buflen; |