summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/sr_device.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-08 15:57:41 -0700
committerTony Lindgren <tony@atomide.com>2012-10-08 15:57:41 -0700
commitfce680e9faaa8acc0ab0a931c5fa823b581cbab0 (patch)
treec96026ec637128c21c665a733db5594ebebbb5a4 /arch/arm/mach-omap2/sr_device.c
parent5e090ed7af10729a396a25df43d69a236e789736 (diff)
parentce3810cdb4ca31238c87e095d2c494a5eaa4f65d (diff)
downloadop-kernel-dev-fce680e9faaa8acc0ab0a931c5fa823b581cbab0.zip
op-kernel-dev-fce680e9faaa8acc0ab0a931c5fa823b581cbab0.tar.gz
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
OMAP PM related fixes for v3.7-rc
Diffstat (limited to 'arch/arm/mach-omap2/sr_device.c')
-rw-r--r--arch/arm/mach-omap2/sr_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c
index cbeae56..f8217a5 100644
--- a/arch/arm/mach-omap2/sr_device.c
+++ b/arch/arm/mach-omap2/sr_device.c
@@ -122,7 +122,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
sr_data->senp_mod = 0x1;
sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name);
- if (IS_ERR(sr_data->voltdm)) {
+ if (!sr_data->voltdm) {
pr_err("%s: Unable to get voltage domain pointer for VDD %s\n",
__func__, sr_dev_attr->sensor_voltdm_name);
goto exit;
OpenPOWER on IntegriCloud