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

Commit 8e65c0ec authored by Filip Aben's avatar Filip Aben Committed by David S. Miller
Browse files

hso: fix disable_net



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: default avatarFilip Aben <f.aben@option.com>
Reported-by: default avatarPiotr Isajew <pki@ex.com.pl>
Reported-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03fe5f3e
Loading
Loading
Loading
Loading
+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;