mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 15:11:48 -04:00
dlkm: nfc: alway probe nfc driver
We need to probe the nfc driver even through I2C communication fail to make sure Force FW Download work. Change-Id: I3a84bd7927ec01f4a663d332dd3551cd00c7a8f2 Signed-off-by: wuwl10 <wuwl10@motorola.com> Reviewed-on: https://gerrit.mot.com/2116211 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Ningkai Zhuang <zhuangnk1@lenovo.com> Reviewed-by: Jun Zhang <zhangj10@motorola.com> Reviewed-by: Hujun Liao <liaohj@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
parent
5cf523287d
commit
4e43d2c020
1 changed files with 1 additions and 3 deletions
|
|
@ -362,7 +362,6 @@ int nfc_i2c_dev_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
ret = nfcc_hw_check(nfc_dev);
|
||||
if (ret) {
|
||||
pr_err("nfc hw check failed ret %d\n", ret);
|
||||
goto err_nfcc_hw_check;
|
||||
}
|
||||
|
||||
device_init_wakeup(&client->dev, true);
|
||||
|
|
@ -372,12 +371,11 @@ int nfc_i2c_dev_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
pr_info("%s success\n", __func__);
|
||||
return 0;
|
||||
|
||||
err_nfcc_hw_check:
|
||||
err_ldo_config_failed:
|
||||
if (nfc_dev->reg) {
|
||||
nfc_ldo_unvote(nfc_dev);
|
||||
regulator_put(nfc_dev->reg);
|
||||
}
|
||||
err_ldo_config_failed:
|
||||
free_irq(client->irq, nfc_dev);
|
||||
err_nfc_misc_remove:
|
||||
nfc_misc_remove(nfc_dev, DEV_COUNT);
|
||||
|
|
|
|||
Loading…
Reference in a new issue