Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb57b75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fixes from Greg KH:
 "Here are three small driver fixes for some reported issues for
  4.9-rc5.

  One for the hyper-v subsystem, fixing up a naming issue that showed up
  in 4.9-rc1, one mei driver fix, and one fix for parallel ports,
  resolving a reported regression.

  All have been in linux-next with no reported issues"

* tag 'char-misc-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  ppdev: fix double-free of pp->pdev->name
  vmbus: make sysfs names consistent with PCI
  mei: bus: fix received data size check in NFC fixup
parents cf2b191c b13d1433

drivers/char/ppdev.c

+0 −3
Original line number Diff line number Diff line
@@ -748,10 +748,7 @@ static int pp_release(struct inode *inode, struct file *file) 
	}



	if (pp->pdev) {

		const char *name = pp->pdev->name;



		parport_unregister_device(pp->pdev);

		kfree(name);

		pp->pdev = NULL;

		pr_debug(CHRDEV "%x: unregistered pardevice\n", minor);

	}

drivers/hv/vmbus_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ int vmbus_device_register(struct hv_device *child_device_obj) 
{

	int ret = 0;



	dev_set_name(&child_device_obj->device, "vmbus-%pUl",

	dev_set_name(&child_device_obj->device, "%pUl",

		     child_device_obj->channel->offermsg.offer.if_instance.b);



	child_device_obj->device.bus = &hv_bus;

drivers/misc/mei/bus-fixup.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, 


	ret = 0;

	bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length);

	if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {

	if (bytes_recv < if_version_length) {

		dev_err(bus->dev, "Could not read IF version\n");

		ret = -EIO;

		goto err;

drivers/nfc/mei_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) 
		return -ENOMEM;



	bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply, if_version_length);

	if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {

	if (bytes_recv < 0 || bytes_recv < if_version_length) {

		pr_err("Could not read IF version\n");

		r = -EIO;

		goto err;