diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-11 11:55:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-11 11:55:56 +0100 |
| commit | e9b3bd248b349433215cf01064a866b632fb3f4b (patch) | |
| tree | 9821327345bdced3d895723cba1181d7ca399aca /drivers/usb/gadget/f_rndis.c | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 80475b849b90d8bed1fe768c496280f4b5c11410 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultz
Diffstat (limited to 'drivers/usb/gadget/f_rndis.c')
| -rw-r--r-- | drivers/usb/gadget/f_rndis.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index 36e8c44d8e5..21c5ee2482d 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c @@ -821,12 +821,12 @@ rndis_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], if (!can_support_rndis(c) || !ethaddr) return -EINVAL; - if (rndis_string_defs[0].id == 0) { - /* ... and setup RNDIS itself */ - status = rndis_init(); - if (status < 0) - return status; + /* setup RNDIS itself */ + status = rndis_init(); + if (status < 0) + return status; + if (rndis_string_defs[0].id == 0) { status = usb_string_ids_tab(c->cdev, rndis_string_defs); if (status) return status; |