diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
| commit | cd0e075784f4bce97b4ed47d4b354f045e895546 (patch) | |
| tree | 2354d4c2f5185c59dc21c537841b55c694cc53ec /drivers/usb/phy | |
| parent | 32fc9eb5b2dcebefb7fb4c8288c739c320362524 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| download | linux-cd0e075784f4bce97b4ed47d4b354f045e895546.tar.gz linux-cd0e075784f4bce97b4ed47d4b354f045e895546.tar.bz2 linux-cd0e075784f4bce97b4ed47d4b354f045e895546.zip | |
Merge 4.0-rc5 into usb-next
We want the USB fixes in here as well to resolve merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-am335x-control.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c index 403fab772724..7b3035ff9434 100644 --- a/drivers/usb/phy/phy-am335x-control.c +++ b/drivers/usb/phy/phy-am335x-control.c @@ -126,6 +126,9 @@ struct phy_control *am335x_get_phy_control(struct device *dev) return NULL; dev = bus_find_device(&platform_bus_type, NULL, node, match); + if (!dev) + return NULL; + ctrl_usb = dev_get_drvdata(dev); if (!ctrl_usb) return NULL; |