diff options
Diffstat (limited to 'drivers/usb/host/uhci-platform.c')
| -rw-r--r-- | drivers/usb/host/uhci-platform.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c index 70dbd95c3f06..b2049b47a08d 100644 --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -113,7 +113,8 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)  				num_ports);  		}  		if (of_device_is_compatible(np, "aspeed,ast2400-uhci") || -		    of_device_is_compatible(np, "aspeed,ast2500-uhci")) { +		    of_device_is_compatible(np, "aspeed,ast2500-uhci") || +		    of_device_is_compatible(np, "aspeed,ast2600-uhci")) {  			uhci->is_aspeed = 1;  			dev_info(&pdev->dev,  				 "Enabled Aspeed implementation workarounds\n"); @@ -132,7 +133,11 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)  		goto err_rmr;  	} -	ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED); +	ret = platform_get_irq(pdev, 0); +	if (ret < 0) +		goto err_clk; + +	ret = usb_add_hcd(hcd, ret, IRQF_SHARED);  	if (ret)  		goto err_clk; |