diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-11-05 14:11:10 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-11-05 14:11:10 +0300 |
| commit | b026277a8403fe72acb4b52b9bebe716499c064c (patch) | |
| tree | 1f2f45ab4591fe5fb7996e03c821fbe44c24764a /drivers/hid/hid-cougar.c | |
| parent | 820e9906cf64142169134f35b996108303cf22ca (diff) | |
| parent | 8e3cd9221c66b97c31964c013499e6c8d0f49440 (diff) | |
| download | linux-b026277a8403fe72acb4b52b9bebe716499c064c.tar.xz | |
Merge branch 'for-5.16/core' into for-linus
- update to handle TransducerSerialNumber2 which has been recently
added to the specification (Felipe Balbi)
Diffstat (limited to 'drivers/hid/hid-cougar.c')
| -rw-r--r-- | drivers/hid/hid-cougar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c index 28d671c5e0ca..cb8bd8aae15b 100644 --- a/drivers/hid/hid-cougar.c +++ b/drivers/hid/hid-cougar.c @@ -179,10 +179,9 @@ static int cougar_bind_shared_data(struct hid_device *hdev, cougar->shared = shared; - error = devm_add_action(&hdev->dev, cougar_remove_shared_data, cougar); + error = devm_add_action_or_reset(&hdev->dev, cougar_remove_shared_data, cougar); if (error) { mutex_unlock(&cougar_udev_list_lock); - cougar_remove_shared_data(cougar); return error; } |