Commit fb945c95 authored Feb 26, 2020 by Andy Shevchenko Committed by Lee Jones Mar 30, 2020

mfd: dln2: Fix sanity checking for endpoints



While the commit 2b8bd606 ("mfd: dln2: More sanity checking for endpoints")
tries to harden the sanity checks it made at the same time a regression,
i.e.  mixed in and out endpoints. Obviously it should have been not tested on
real hardware at that time, but unluckily it didn't happen.

So, fix above mentioned typo and make device being enumerated again.

While here, introduce an enumerator for magic values to prevent similar issue
to happen in the future.

Fixes: 2b8bd606 ("mfd: dln2: More sanity checking for endpoints")
Cc: Oliver Neukum <oneukum@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 4e213b45

drivers/mfd/dln2.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -90,6 +90,11 @@ struct dln2_mod_rx_slots {
		spinlock_t lock;
		};

		enum dln2_endpoint {
		DLN2_EP_OUT = 0,
		DLN2_EP_IN = 1,
		};

		struct dln2_dev {
		struct usb_device *usb_dev;
		struct usb_interface *interface;
		@@ -733,10 +738,10 @@ static int dln2_probe(struct usb_interface *interface,
		hostif->desc.bNumEndpoints < 2)
		return -ENODEV;

		epin = &hostif->endpoint[0].desc;
		epout = &hostif->endpoint[1].desc;
		epout = &hostif->endpoint[DLN2_EP_OUT].desc;
		if (!usb_endpoint_is_bulk_out(epout))
		return -ENODEV;
		epin = &hostif->endpoint[DLN2_EP_IN].desc;
		if (!usb_endpoint_is_bulk_in(epin))
		return -ENODEV;

Admin message