iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers

Browse Source 
Content-Disposition: inline; filename=i2c-algo-error-handling-fix.patch

It is possible for i2c_add_adapter() to fail.  Several I2C algorithm
drivers ignore that fact.  This (compile-tested only) patch fixes them.

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark M. Hoffman 2006-07-01 17:16:06 +02:00 committed by Greg Kroah-Hartman
parent 5d925fecac
commit b39ad0cf7c
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/i2c/algos/i2c-algo-bit.c
View File

@ -544,8 +544,7 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */
i2c_add_adapter(adap);
return 0;
return i2c_add_adapter(adap);
}

4
drivers/i2c/algos/i2c-algo-ite.c
View File

@ -742,10 +742,8 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
adap->retries = 3; /* be replaced by defines */
adap->flags = 0;
i2c_add_adapter(adap);
iic_init(iic_adap);
return 0;
return i2c_add_adapter(adap);
}

6
drivers/i2c/algos/i2c-algo-pca.c
View File

@ -374,10 +374,10 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */
rval = pca_init(pca_adap);
if ((rval = pca_init(pca_adap)))
return rval;
if (!rval)
i2c_add_adapter(adap);
rval = i2c_add_adapter(adap);
return rval;
}

8
drivers/i2c/algos/i2c-algo-pcf.c
View File

@ -479,9 +479,11 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */
rval = pcf_init_8584(pcf_adap);
if (!rval)
i2c_add_adapter(adap);
if ((rval = pcf_init_8584(pcf_adap)))
return rval;
rval = i2c_add_adapter(adap);
return rval;
}

4
drivers/i2c/algos/i2c-algo-sibyte.c
View File

@ -173,9 +173,7 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
printk("\n");
}
i2c_add_adapter(i2c_adap);
return 0;
return i2c_add_adapter(i2c_adap);
}