Re: [PATCH 6/11] HWMON: DA9052 hwmon driver v1

[Guenter Roeck <guenter.roeck@ericsson.com>]

On Wed, Jun 29, 2011 at 07:44:08AM -0400, Ashish Jangam wrote:
> On Tue, 2011-06-28 at 23:05 +0530, Guenter Roeck wrote:
> > On Tue, 2011-06-28 at 10:24 -0400, ashish jangam wrote:
> > > +static ssize_t da9052_read_vddout(struct device *dev,
> > > +                                  struct device_attribute *devattr, char *buf)
> > > +{
> > > +       struct da9052_hwmon *hwmon = dev_get_drvdata(dev);
> > > +       int ret, vdd = -1;
> > > +
> > > +       mutex_lock(&hwmon->hwmon_lock);
> > > +
> > > +       ret = da9052_enable_vddout_channel(hwmon->da9052);
> > > +       if (ret < 0)
> > > +               goto hwmon_err;
> > > +
> > > +       ret = da9052_reg_read(hwmon->da9052, DA9052_VDD_RES_REG);
> > > +       if (ret < 0)
> > > +               pr_err("failed to read VDD_RES_REG\n");
> > > +       else
> > > +               vdd = ret;
> > > +
> > > +       ret = da9052_disable_vddout_channel(hwmon->da9052);
> > > +       if (ret < 0)
> > > +               goto hwmon_err;
> > > +
> > > +       if (vdd >= 0) {
> > > +               mutex_unlock(&hwmon->hwmon_lock);
> > > +               return sprintf(buf, "%d\n", vdd);
> > > +       }
> > > +
> > > +hwmon_err:
> > > +       mutex_unlock(&hwmon->hwmon_lock);
> > > +       return ret;
> > > +}
> > 
> > This function still produces a bad result if the call to
> > da9052_reg_read() fails and the call to da9052_disable_vddout_channel()
> > doesn't. 
> Thanks much for comments and patience. When vddout channel is enabled
> and then read from this channel fails then, in this case should vddout
> channel get disabled? Is this correct understanding.

Hmm, yes, you are right there. You should try to disable it. But you would have 
to do that such that you don't override the original error. One possibility would
be to add an unconditional call to da9052_disable_vddout_channel() into the error 
path.

	ret = da9052_reg_read(hwmon->da9052, DA9052_VDD_RES_REG);
	if (ret < 0)
		goto hwmon_err_release;

	...
hwmon_err_release:
	da9052_disable_vddout_channel(hwmon->da9052);
hwmon_err:
	...

Guenter