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

Commit 7b1f513a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: console: Check if port is valid in resize_console
  virtio: console: Generate a kobject CHANGE event on adding 'name' attribute
parents 258152ac 2de16a49

drivers/char/virtio_console.c

+13 −2
Original line number Diff line number Diff line
@@ -681,6 +681,10 @@ static void resize_console(struct port *port) 
	struct virtio_device *vdev;

	struct winsize ws;



	/* The port could have been hot-unplugged */

	if (!port)

		return;



	vdev = port->portdev->vdev;

	if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_SIZE)) {

		vdev->config->get(vdev,
@@ -947,11 +951,18 @@ static void handle_control_message(struct ports_device *portdev, 
		 */

		err = sysfs_create_group(&port->dev->kobj,

					 &port_attribute_group);

		if (err)

		if (err) {

			dev_err(port->dev,

				"Error %d creating sysfs device attributes\n",

				err);



		} else {

			/*

			 * Generate a udev event so that appropriate

			 * symlinks can be created based on udev

			 * rules.

			 */

			kobject_uevent(&port->dev->kobj, KOBJ_CHANGE);

		}

		break;

	case VIRTIO_CONSOLE_PORT_REMOVE:

		/*