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

Commit 7b4a0367 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

USB: otg/ulpi: bail out on read errors 



otg_read may return errnos, so bail out correctly to prevent bogus
ID-numbers.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2bb14cbf

drivers/usb/otg/ulpi.c

+11 −6
Original line number Diff line number Diff line
@@ -59,12 +59,17 @@ static int ulpi_set_flags(struct otg_transceiver *otg) 


static int ulpi_init(struct otg_transceiver *otg)

{

	int i, vid, pid;



	vid = (otg_io_read(otg, ULPI_VENDOR_ID_HIGH) << 8) |

	       otg_io_read(otg, ULPI_VENDOR_ID_LOW);

	pid = (otg_io_read(otg, ULPI_PRODUCT_ID_HIGH) << 8) |

	       otg_io_read(otg, ULPI_PRODUCT_ID_LOW);

	int i, vid, pid, ret;

	u32 ulpi_id = 0;



	for (i = 0; i < 4; i++) {

		ret = otg_io_read(otg, ULPI_PRODUCT_ID_HIGH - i);

		if (ret < 0)

			return ret;

		ulpi_id = (ulpi_id << 8) | ret;

	}

	vid = ulpi_id & 0xffff;

	pid = ulpi_id >> 16;



	pr_info("ULPI transceiver vendor/product ID 0x%04x/0x%04x\n", vid, pid);