diff options
author | Greg Kroah-Hartman | 2016-10-30 11:38:44 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2016-10-30 11:38:44 +0100 |
commit | bdc065666a591fddc4e55cbdcd6c7b02f289b5ff (patch) | |
tree | acb92182d7c28a8d5176feb99fd7fb110a693ab7 /drivers/staging/greybus/es2.c | |
parent | staging: vc04_services: use bcm2835 consequently (diff) | |
parent | Linux 4.9-rc3 (diff) | |
download | kernel-qcow2-linux-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.gz kernel-qcow2-linux-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.xz kernel-qcow2-linux-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.zip |
Merge 4.9-rc3 into staging-next
This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/greybus/es2.c')
-rw-r--r-- | drivers/staging/greybus/es2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c index d7fd4a05f113..f1d256df06d5 100644 --- a/drivers/staging/greybus/es2.c +++ b/drivers/staging/greybus/es2.c @@ -1547,7 +1547,8 @@ static int ap_probe(struct usb_interface *interface, INIT_LIST_HEAD(&es2->arpcs); spin_lock_init(&es2->arpc_lock); - if (es2_arpc_in_enable(es2)) + retval = es2_arpc_in_enable(es2); + if (retval) goto error; retval = gb_hd_add(hd); |