diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-06-30 17:41:39 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-06-30 17:41:39 +0200 |
| commit | 44f10dbefd5e41b3385af91f855a57aa2afaf40e (patch) | |
| tree | 944c9f1cda8322691468e6f10dc5b0d41c487621 /drivers/nfc/st21nfca/i2c.c | |
| parent | Merge branch 'master' into mm-hotfixes-stable (diff) | |
| parent | csky: fix up lock_mm_and_find_vma() conversion (diff) | |
| download | linux-44f10dbefd5e41b3385af91f855a57aa2afaf40e.tar.xz linux-44f10dbefd5e41b3385af91f855a57aa2afaf40e.zip | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'drivers/nfc/st21nfca/i2c.c')
| -rw-r--r-- | drivers/nfc/st21nfca/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 55f7a2391bb1..064a63db288b 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -597,7 +597,7 @@ static struct i2c_driver st21nfca_hci_i2c_driver = { .of_match_table = of_match_ptr(of_st21nfca_i2c_match), .acpi_match_table = ACPI_PTR(st21nfca_hci_i2c_acpi_match), }, - .probe_new = st21nfca_hci_i2c_probe, + .probe = st21nfca_hci_i2c_probe, .id_table = st21nfca_hci_i2c_id_table, .remove = st21nfca_hci_i2c_remove, }; |