Merge 08424a0922 ("wifi: brcm80211: fmac: Add error handling for brcmf_usb_dl_writeimage()") into android-mainline

Steps on the way to 6.6.90

Change-Id: Idcefd012327b02b1071f4441ef76ae87ce9a06bc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-05-21 10:02:15 +00:00

View File

@@ -903,14 +903,16 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
} }
/* 1) Prepare USB boot loader for runtime image */ /* 1) Prepare USB boot loader for runtime image */
brcmf_usb_dl_cmd(devinfo, DL_START, &state, sizeof(state)); err = brcmf_usb_dl_cmd(devinfo, DL_START, &state, sizeof(state));
if (err)
goto fail;
rdlstate = le32_to_cpu(state.state); rdlstate = le32_to_cpu(state.state);
rdlbytes = le32_to_cpu(state.bytes); rdlbytes = le32_to_cpu(state.bytes);
/* 2) Check we are in the Waiting state */ /* 2) Check we are in the Waiting state */
if (rdlstate != DL_WAITING) { if (rdlstate != DL_WAITING) {
brcmf_err("Failed to DL_START\n"); brcmf_err("Invalid DL state: %u\n", rdlstate);
err = -EINVAL; err = -EINVAL;
goto fail; goto fail;
} }