summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-12-16 13:42:30 +0300
committerJiri Kosina <jkosina@suse.cz>2020-12-16 13:42:30 +0300
commit47cdd7f139dc3e896a627e8c0e98d0501555a889 (patch)
tree58735bb21979e0aac5db286f633abe8576e483ac /drivers/hid
parent19a0b6d79c970680cdaa3054728c9a64445f2310 (diff)
parent9735d9deb109afaab747fb853b804cb5dc144c0a (diff)
downloadlinux-47cdd7f139dc3e896a627e8c0e98d0501555a889.tar.xz
Merge branch 'for-5.11/intel-ish' into for-linus
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/intel-ish-hid/ishtp-hid.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c
index b8aae69ad15d..393bed0abee9 100644
--- a/drivers/hid/intel-ish-hid/ishtp-hid.c
+++ b/drivers/hid/intel-ish-hid/ishtp-hid.c
@@ -211,10 +211,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
struct ishtp_hid_data *hid_data;
hid = hid_allocate_device();
- if (IS_ERR(hid)) {
- rv = PTR_ERR(hid);
- return -ENOMEM;
- }
+ if (IS_ERR(hid))
+ return PTR_ERR(hid);
hid_data = kzalloc(sizeof(*hid_data), GFP_KERNEL);
if (!hid_data) {