Skip to content

Commit acb57b7

Browse files
committed
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
2 parents cf2b191 + b13d143 commit acb57b7

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

drivers/char/ppdev.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,7 @@ static int pp_release(struct inode *inode, struct file *file)
748748
}
749749

750750
if (pp->pdev) {
751-
const char *name = pp->pdev->name;
752-
753751
parport_unregister_device(pp->pdev);
754-
kfree(name);
755752
pp->pdev = NULL;
756753
pr_debug(CHRDEV "%x: unregistered pardevice\n", minor);
757754
}

drivers/hv/vmbus_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ int vmbus_device_register(struct hv_device *child_device_obj)
961961
{
962962
int ret = 0;
963963

964-
dev_set_name(&child_device_obj->device, "vmbus-%pUl",
964+
dev_set_name(&child_device_obj->device, "%pUl",
965965
child_device_obj->channel->offermsg.offer.if_instance.b);
966966

967967
child_device_obj->device.bus = &hv_bus;

drivers/misc/mei/bus-fixup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int mei_nfc_if_version(struct mei_cl *cl,
178178

179179
ret = 0;
180180
bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length);
181-
if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {
181+
if (bytes_recv < if_version_length) {
182182
dev_err(bus->dev, "Could not read IF version\n");
183183
ret = -EIO;
184184
goto err;

drivers/nfc/mei_phy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)
133133
return -ENOMEM;
134134

135135
bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply, if_version_length);
136-
if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {
136+
if (bytes_recv < 0 || bytes_recv < if_version_length) {
137137
pr_err("Could not read IF version\n");
138138
r = -EIO;
139139
goto err;

0 commit comments

Comments
 (0)