2010-11-09 01:36:52

by Axel Lin

Subject: [PATCH] hwmon: (ad7414) Return proper error code for ad7414_probe()

Return proper error if i2c_check_functionality reports
the adapter does not support the capability we need.

Also remove unneeded initialization for err variable.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/hwmon/ad7414.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
index 1e4c21f..86d822a 100644
--- a/drivers/hwmon/ad7414.c
+++ b/drivers/hwmon/ad7414.c
@@ -178,11 +178,13 @@ static int ad7414_probe(struct i2c_client *client,
{
struct ad7414_data *data;
int conf;
- int err = 0;
+ int err;

if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA |
- I2C_FUNC_SMBUS_READ_WORD_DATA))
+ I2C_FUNC_SMBUS_READ_WORD_DATA)) {
+ err = -EOPNOTSUPP;
goto exit;
+ }

data = kzalloc(sizeof(struct ad7414_data), GFP_KERNEL);
if (!data) {
--
1.7.2

2010-11-09 02:45:20

by Guenter Roeck

Subject: Re: [lm-sensors] [PATCH] hwmon: (ad7414) Return proper error code for ad7414_probe()

On Mon, Nov 08, 2010 at 08:40:34PM -0500, Axel Lin wrote:
> Return proper error if i2c_check_functionality reports
> the adapter does not support the capability we need.
>
> Also remove unneeded initialization for err variable.
>
> Signed-off-by: Axel Lin <[email protected]>

Applied.

Thanks,
Guenter

2010-11-09 02:49:07

by Sean MacLennan

Subject: Re: [PATCH] hwmon: (ad7414) Return proper error code for ad7414_probe()

On Mon, 8 Nov 2010 20:40:34 -0500
"Axel Lin" <[email protected]> wrote:

> [PATCH] hwmon: (ad7414) Return proper error code for ad7414_probe()
>
> Return proper error if i2c_check_functionality reports
> the adapter does not support the capability we need.
>
> Also remove unneeded initialization for err variable.
>
> Signed-off-by: Axel Lin <[email protected]>

Acked-by: Sean MacLennan <[email protected]>

> ---
> drivers/hwmon/ad7414.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
> index 1e4c21f..86d822a 100644
> --- a/drivers/hwmon/ad7414.c
> +++ b/drivers/hwmon/ad7414.c
> @@ -178,11 +178,13 @@ static int ad7414_probe(struct i2c_client
> *client, {
> struct ad7414_data *data;
> int conf;
> - int err = 0;
> + int err;

I wouldn't mind if this was "int conf, err;", but I don't mind the way
it is.

Cheers,
Sean