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

Commit 51b0ce38 authored by Tal Shorer's avatar Tal Shorer Committed by Felipe Balbi
Browse files

usb: ulpi: move setting of ulpi->dev parent up in ulpi_register() 



Once ulpi operations use the parent device directly, this will be
needed during the operations used in ulpi_register() itself, so set
the parent field before calling any ulpi operations.

Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarTal Shorer <tal.shorer@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 65e1ff7f

drivers/usb/common/ulpi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -156,6 +156,8 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) 
{

{

	int ret;

	int ret;





	ulpi->dev.parent = dev; /* needed early for ops */



	/* Test the interface */

	/* Test the interface */

	ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa);

	ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa);

	if (ret < 0)

	if (ret < 0)
@@ -174,7 +176,6 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) 
	ulpi->id.product = ulpi_read(ulpi, ULPI_PRODUCT_ID_LOW);

	ulpi->id.product = ulpi_read(ulpi, ULPI_PRODUCT_ID_LOW);

	ulpi->id.product |= ulpi_read(ulpi, ULPI_PRODUCT_ID_HIGH) << 8;

	ulpi->id.product |= ulpi_read(ulpi, ULPI_PRODUCT_ID_HIGH) << 8;





	ulpi->dev.parent = dev;

	ulpi->dev.bus = &ulpi_bus;

	ulpi->dev.bus = &ulpi_bus;

	ulpi->dev.type = &ulpi_dev_type;

	ulpi->dev.type = &ulpi_dev_type;

	dev_set_name(&ulpi->dev, "%s.ulpi", dev_name(dev));

	dev_set_name(&ulpi->dev, "%s.ulpi", dev_name(dev));