openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Tal Shorer 2016-08-16 19:04:46 +03:00 committed by Felipe Balbi
parent 65e1ff7f4b
commit 51b0ce387b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/common/ulpi.c
View File

@ -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));