hso: fix disable_net (8e65c0ec) · Commits · 戴 / test

The HSO driver incorrectly creates a serial device instead of a net device when disable_net is set. It shouldn't create anything for the network interface. Signed-off-by:

Filip Aben <f.aben@option.com> Reported-by:

Piotr Isajew <pki@ex.com.pl> Reported-by:

Johan Hovold <jhovold@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/usb/hso.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -2994,12 +2994,14 @@ static int hso_probe(struct usb_interface *interface,

		case HSO_INTF_BULK:
		/* It's a regular bulk interface */
		if (((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) &&
		!disable_net)
		hso_dev = hso_create_net_device(interface, port_spec);
		else
		if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
		if (!disable_net)
		hso_dev =
		hso_create_net_device(interface, port_spec);
		} else {
		hso_dev =
		hso_create_bulk_serial_device(interface, port_spec);
		}
		if (!hso_dev)
		goto exit;
		break;

Admin message