From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 11 Oct 2013 07:01:03 +0000 (+0200)
Subject: usb: phy: don't return with NULL from devm_usb_get_phy()
X-Git-Tag: v3.13-rc1~174^2~22^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f4d1e7bdd9f293a522e5559f1b64a95c066c15e;p=profile%2Fcommon%2Fkernel-common.git

usb: phy: don't return with NULL from devm_usb_get_phy()

The callers are expecting an ERR_PTR value in case
of an error. Change he code to return with an encoded
-ENOMEM value in the case of a failed devres_alloc call.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index a9984c7..1b74523 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -98,7 +98,7 @@ struct usb_phy *devm_usb_get_phy(struct device *dev, enum usb_phy_type type)
 
 	ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL);
 	if (!ptr)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	phy = usb_get_phy(type);
 	if (!IS_ERR(phy)) {