projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b59125
)
NFC: nxp-nci: Release firmware when switching to FW mode fails
author
Samuel Ortiz
<sameo@linux.intel.com>
Sun, 5 Apr 2015 22:58:51 +0000
(
00:58
+0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Sun, 5 Apr 2015 22:58:51 +0000
(
00:58
+0200)
In that case, the firmware work will never be scheduled, will
never complete and thus the firmware will never be released.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/nxp-nci/firmware.c
patch
|
blob
|
history
diff --git
a/drivers/nfc/nxp-nci/firmware.c
b/drivers/nfc/nxp-nci/firmware.c
index
74f9820
..
5291797
100644
(file)
--- a/
drivers/nfc/nxp-nci/firmware.c
+++ b/
drivers/nfc/nxp-nci/firmware.c
@@
-234,8
+234,10
@@
int nxp_nci_fw_download(struct nci_dev *ndev, const char *firmware_name)
goto fw_download_exit;
r = info->phy_ops->set_mode(info->phy_id, NXP_NCI_MODE_FW);
- if (r < 0)
+ if (r < 0) {
+ release_firmware(fw_info->fw);
goto fw_download_exit;
+ }
info->mode = NXP_NCI_MODE_FW;