usb.c (f63e4f7d4179c9157c51bbe82af7c8f6b5fb39dd) usb.c (6d0507a777fbc533f7f1bf5664a81982dd50dece)
1/*
2 * Copyright (c) 2011 Broadcom Corporation
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 1145 unchanged lines hidden (view full) ---

1154 goto fail;
1155
1156 return 0;
1157fail:
1158 brcmf_detach(devinfo->dev);
1159 return ret;
1160}
1161
1/*
2 * Copyright (c) 2011 Broadcom Corporation
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 1145 unchanged lines hidden (view full) ---

1154 goto fail;
1155
1156 return 0;
1157fail:
1158 brcmf_detach(devinfo->dev);
1159 return ret;
1160}
1161
1162static void brcmf_usb_probe_phase2(struct device *dev,
1162static void brcmf_usb_probe_phase2(struct device *dev, int ret,
1163 const struct firmware *fw,
1164 void *nvram, u32 nvlen)
1165{
1166 struct brcmf_bus *bus = dev_get_drvdata(dev);
1167 struct brcmf_usbdev_info *devinfo;
1163 const struct firmware *fw,
1164 void *nvram, u32 nvlen)
1165{
1166 struct brcmf_bus *bus = dev_get_drvdata(dev);
1167 struct brcmf_usbdev_info *devinfo;
1168 int ret;
1169
1168
1169 if (ret)
1170 goto error;
1171
1170 brcmf_dbg(USB, "Start fw downloading\n");
1171
1172 devinfo = bus->bus_priv.usb->devinfo;
1173 ret = check_file(fw->data);
1174 if (ret < 0) {
1175 brcmf_err("invalid firmware\n");
1176 release_firmware(fw);
1177 goto error;

--- 337 unchanged lines hidden --- 		1172 brcmf_dbg(USB, "Start fw downloading\n");
1173
1174 devinfo = bus->bus_priv.usb->devinfo;
1175 ret = check_file(fw->data);
1176 if (ret < 0) {
1177 brcmf_err("invalid firmware\n");
1178 release_firmware(fw);
1179 goto error;

--- 337 unchanged lines hidden ---