Commit 9f65ed5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux 

Pull Hyper-V update from Wei Liu:

 - Update MAINTAINERS file for Hyper-V

 - One cleanup patch for Hyper-V HID driver

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  HID: hyperv: NULL check before some freeing functions is not needed.
  Hyper-V: add myself as a maintainer
  Hyper-V: Drop Sasha Levin from the Hyper-V maintainers
parents 6fd145da 5313b2a5

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7738,7 +7738,7 @@ Hyper-V CORE AND DRIVERS 
M:	"K. Y. Srinivasan" <kys@microsoft.com>

M:	Haiyang Zhang <haiyangz@microsoft.com>

M:	Stephen Hemminger <sthemmin@microsoft.com>

M:	Sasha Levin <sashal@kernel.org>

M:	Wei Liu <wei.liu@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

L:	linux-hyperv@vger.kernel.org

S:	Supported

drivers/hid/hid-hyperv.c

+2 −4
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device, 
		goto cleanup;



	/* The pointer is not NULL when we resume from hibernation */

	if (input_device->hid_desc != NULL)

	kfree(input_device->hid_desc);

	input_device->hid_desc = kmemdup(desc, desc->bLength, GFP_ATOMIC);
@@ -207,7 +206,6 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device, 
	}



	/* The pointer is not NULL when we resume from hibernation */

	if (input_device->report_desc != NULL)

	kfree(input_device->report_desc);

	input_device->report_desc = kzalloc(input_device->report_desc_size,

					  GFP_ATOMIC);