Merge 3.4-rc4 into usb-next.
This resolves the conflict in: drivers/usb/host/ehci-fsl.c And picks up loads of xhci bugfixes to make it easier for others to test with. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -1933,11 +1933,7 @@ static int ene_load_bincode(struct us_data *us, unsigned char flag)
|
||||
kfree(buf);
|
||||
|
||||
nofw:
|
||||
if (sd_fw != NULL) {
|
||||
release_firmware(sd_fw);
|
||||
sd_fw = NULL;
|
||||
}
|
||||
|
||||
release_firmware(sd_fw);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user