diff options
author | Greg Kroah-Hartman | 2016-07-04 17:17:08 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2016-07-04 17:17:08 +0200 |
commit | 67417f9c262e2cd4b706eba3e1fd879d0bebc6d8 (patch) | |
tree | 5ab867187357c4c0e23e409f42f0e0dff63d6fa8 /drivers/phy/phy-bcm-ns-usb2.c | |
parent | tty/serial: atmel: enforce tasklet init and termination sequences (diff) | |
parent | Linux 4.7-rc6 (diff) | |
download | kernel-qcow2-linux-67417f9c262e2cd4b706eba3e1fd879d0bebc6d8.tar.gz kernel-qcow2-linux-67417f9c262e2cd4b706eba3e1fd879d0bebc6d8.tar.xz kernel-qcow2-linux-67417f9c262e2cd4b706eba3e1fd879d0bebc6d8.zip |
Merge 4.7-rc6 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy/phy-bcm-ns-usb2.c')
-rw-r--r-- | drivers/phy/phy-bcm-ns-usb2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-bcm-ns-usb2.c b/drivers/phy/phy-bcm-ns-usb2.c index 95ab6b2a0de5..58dff80e9386 100644 --- a/drivers/phy/phy-bcm-ns-usb2.c +++ b/drivers/phy/phy-bcm-ns-usb2.c @@ -109,8 +109,8 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev) } usb2->phy = devm_phy_create(dev, NULL, &ops); - if (IS_ERR(dev)) - return PTR_ERR(dev); + if (IS_ERR(usb2->phy)) + return PTR_ERR(usb2->phy); phy_set_drvdata(usb2->phy, usb2); platform_set_drvdata(pdev, usb2); |