diff --git a/[refs] b/[refs] index 1fe792550b64..ed89ce348a03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2012e49e8ad4ae432cf1667e945b0f335c3e6d38 +refs/heads/master: 0c50b444b69f49e38d16b974993a626ad74c59a7 diff --git a/trunk/arch/arm/mach-msm/vreg.c b/trunk/arch/arm/mach-msm/vreg.c index fcb0b9f25684..a839e1913c5b 100644 --- a/trunk/arch/arm/mach-msm/vreg.c +++ b/trunk/arch/arm/mach-msm/vreg.c @@ -70,7 +70,7 @@ struct vreg *vreg_get(struct device *dev, const char *id) if (!strcmp(vregs[n].name, id)) return vregs + n; } - return 0; + return ERR_PTR(-ENOENT); } void vreg_put(struct vreg *vreg)