Re: [patch] fix n900 bt error handling

Pali Rohár
2013-12-05T13:08:35Z

[-- Attachment #1: Type: Text/Plain, Size: 1132 bytes --]

On Thursday 05 December 2013 12:56:08 Pavel Machek wrote:
> Hi!
>
> > I think that we can drop "new" version, because it has
> > several problems and "old" version is working. So now it
> > not make sense to use hack or develop "new" version
> > anymore.
>
> Ok... but this seems still needed. Please apply,
> Pavel
>
> commit 6c65774280a7095dce8b1e995d86b2e079ef5fdb
> Author: Pavel <pavel@ucw.cz>
> Date: Thu Dec 5 12:54:31 2013 +0100
>
> Cleanups should be performed even if firmware load fails.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/drivers/bluetooth/hci_h4p/core.c
> b/drivers/bluetooth/hci_h4p/core.c index ead25c4..e76e889
> 100644
> --- a/drivers/bluetooth/hci_h4p/core.c
> +++ b/drivers/bluetooth/hci_h4p/core.c
> @@ -942,7 +942,7 @@ again:
> err = hci_h4p_read_fw(info, &fw_queue);
> if (err < 0) {
> dev_err(info->dev, "Cannot read firmware\n");
> - return err;
> + goto err_clean;
> }
>
> err = hci_h4p_send_fw(info, &fw_queue);

Done, pushed to 3.12-rc5-n900 and 3.13-rc2-n900 branches.

--
Pali Rohár
pali.rohar@gmail.com

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]