From e1d96ce918ec60de04e796770247e2fc26038ab7 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Tue, 7 Aug 2012 19:56:30 +0530
Subject: [PATCH] --- yaml --- r: 325936 b: refs/heads/master c:
 df6791d7042d839b68c58cd7dc3699f9ae5a8f22 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/usb/otg/otg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4722cba001a..77e741885324 100644
--- 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
index 1bf60a22595c..a30c04115115 100644
--- 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;
 	}