From 4e43d2c0206c5bd7689e985370d23cef219ba976 Mon Sep 17 00:00:00 2001 From: wuwl10 Date: Mon, 15 Nov 2021 17:19:32 +0800 Subject: [PATCH] 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 Reviewed-on: https://gerrit.mot.com/2116211 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Ningkai Zhuang Reviewed-by: Jun Zhang Reviewed-by: Hujun Liao Submit-Approved: Jira Key --- drivers/nfc/sn1xx/nfc_i2c_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/nfc/sn1xx/nfc_i2c_drv.c b/drivers/nfc/sn1xx/nfc_i2c_drv.c index 4c350fb5613b..8c49ba9977df 100644 --- a/drivers/nfc/sn1xx/nfc_i2c_drv.c +++ b/drivers/nfc/sn1xx/nfc_i2c_drv.c @@ -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);