Skip to content

Commit

Permalink
ARM: OMAP3+: SmartReflex: fix error handling
Browse files Browse the repository at this point in the history
Fix the code to correctly use IS_ERR and PTR_ERR on the return
values pointers

Reported-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jean Pihet <j-pihet@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
  • Loading branch information
Jean Pihet authored and Kevin Hilman committed Mar 5, 2012
1 parent 54b28cd commit 63371fa
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/arm/mach-omap2/smartreflex.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ int sr_configure_errgen(struct voltagedomain *voltdm)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
return -EINVAL;
return PTR_ERR(sr);
}

if (!sr->clk_length)
Expand Down Expand Up @@ -489,7 +489,7 @@ int sr_disable_errgen(struct voltagedomain *voltdm)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
return -EINVAL;
return PTR_ERR(sr);
}

switch (sr->ip_type) {
Expand Down Expand Up @@ -540,7 +540,7 @@ int sr_configure_minmax(struct voltagedomain *voltdm)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
return -EINVAL;
return PTR_ERR(sr);
}

if (!sr->clk_length)
Expand Down Expand Up @@ -626,15 +626,15 @@ int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
return -EINVAL;
return PTR_ERR(sr);
}

volt_data = omap_voltage_get_voltdata(sr->voltdm, volt);

if (IS_ERR(volt_data)) {
dev_warn(&sr->pdev->dev, "%s: Unable to get voltage table"
"for nominal voltage %ld\n", __func__, volt);
return -ENODATA;
return PTR_ERR(volt_data);
}

nvalue_reciprocal = sr_retrieve_nvalue(sr, volt_data->sr_efuse_offs);
Expand Down Expand Up @@ -1079,7 +1079,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)
if (IS_ERR(sr_info)) {
dev_warn(&pdev->dev, "%s: omap_sr struct not found\n",
__func__);
return -EINVAL;
return PTR_ERR(sr_info);
}

if (sr_info->autocomp_active)
Expand Down

0 comments on commit 63371fa

Please sign in to comment.