Commit 47cdd7f1 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.11/intel-ish' into for-linus

parents 19a0b6d7 9735d9de

drivers/hid/intel-ish-hid/ishtp-hid.c

+2 −4
Original line number Diff line number Diff line
@@ -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) {