mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
Merge branch 'for-5.11/intel-ish' into for-linus
This commit is contained in:
commit
47cdd7f139
1 changed files with 2 additions and 4 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue