diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-14 11:35:16 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-09-14 11:35:16 -0600 |
| commit | fef40b2369a4ececa16b4d02b625e45252fe5d0a (patch) | |
| tree | 22445e45f0882630e410b89e2a26fd3e9ba9c30b /drivers/usb/otg/otg.c | |
| parent | f49540d1d7e90dc9864d96ad5a505d7feb8efbcc (diff) | |
| parent | 363366cf61c544ea476f3d220f43a95cb03014f5 (diff) | |
Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
Diffstat (limited to 'drivers/usb/otg/otg.c')
| -rw-r--r-- | drivers/usb/otg/otg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c index 1bf60a22595c..a30c04115115 100644 --- a/drivers/usb/otg/otg.c +++ b/drivers/usb/otg/otg.c @@ -159,7 +159,7 @@ int usb_add_phy(struct usb_phy *x, enum usb_phy_type type) unsigned long flags; struct usb_phy *phy; - if (x && x->type != USB_PHY_TYPE_UNDEFINED) { + if (x->type != USB_PHY_TYPE_UNDEFINED) { dev_err(x->dev, "not accepting initialized PHY %s\n", x->label); return -EINVAL; } |