---

yaml --- r: 325936 b: refs/heads/master c: df6791d h: refs/heads/master v: v3
git-mirror · Aug 9, 2012 · e1d96ce · e1d96ce
1 parent 30dcb10
commit e1d96ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c84d364f8178d2bc12827836bf58eb45598262a4
+refs/heads/master: df6791d7042d839b68c58cd7dc3699f9ae5a8f22
diff --git a/trunk/drivers/usb/otg/otg.c b/trunk/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;
 	}