diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:30:03 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:30:03 +0200 |
| commit | 7147935a0cf693e86daeaa68811f150140ece024 (patch) | |
| tree | 4886a7eafa844f4b3d0bdccc3fa35869e622f199 /drivers/hid/hid-picolcd_core.c | |
| parent | 53c716412708db7000e06292fb89b2609f9a48f7 (diff) | |
| parent | 87fcb6a69e54527ccaeb5878168cccdba9f6b6ae (diff) | |
Merge branch 'for-5.4/cleanup' into for-linus
- cleanup of ->drvdata handling between HID core and drivers, from
Benjamin Tissoires
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-picolcd_core.c')
| -rw-r--r-- | drivers/hid/hid-picolcd_core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index 5f7a39a5d4af..1b5c63241af0 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c @@ -534,8 +534,7 @@ static int picolcd_probe(struct hid_device *hdev, data = kzalloc(sizeof(struct picolcd_data), GFP_KERNEL); if (data == NULL) { hid_err(hdev, "can't allocate space for Minibox PicoLCD device data\n"); - error = -ENOMEM; - goto err_no_cleanup; + return -ENOMEM; } spin_lock_init(&data->lock); @@ -597,9 +596,6 @@ err_cleanup_hid_hw: hid_hw_stop(hdev); err_cleanup_data: kfree(data); -err_no_cleanup: - hid_set_drvdata(hdev, NULL); - return error; } @@ -635,7 +631,6 @@ static void picolcd_remove(struct hid_device *hdev) picolcd_exit_cir(data); picolcd_exit_keys(data); - hid_set_drvdata(hdev, NULL); mutex_destroy(&data->mutex); /* Finally, clean up the picolcd data itself */ kfree(data); |