| Message ID | 1611002626-5889-3-git-send-email-jeff@labundy.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2539da6677b6355e124b99d1dbe15eb1066f1d46 |
| Headers | show |
| Series | input: iqs5xx: Minor enhancements and optimizations | expand |
On Mon, Jan 18, 2021 at 02:43:38PM -0600, Jeff LaBundy wrote: > After user space writes the fw_file attribute to push new firmware > to the device, the driver calls iqs5xx_dev_init() to re-initialize > the device with the updated firmware or recover the device in case > the update failed. > > In the case of the latter, however, iqs5xx_fw_file_write() returns > zero (success) so long as iqs5xx_dev_init() does not fail, and any > error encountered during the update process is lost. Solve this by > saving the error before calling iqs5xx_dev_init(). > > Signed-off-by: Jeff LaBundy <jeff@labundy.com> Applied, thank you.
diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c index 08e79d6..ff0a0e9 100644 --- a/drivers/input/touchscreen/iqs5xx.c +++ b/drivers/input/touchscreen/iqs5xx.c @@ -883,7 +883,7 @@ static int iqs5xx_fw_file_parse(struct i2c_client *client, static int iqs5xx_fw_file_write(struct i2c_client *client, const char *fw_file) { struct iqs5xx_private *iqs5xx = i2c_get_clientdata(client); - int error; + int error, error_bl; u8 *pmap; if (iqs5xx->bl_status == IQS5XX_BL_STATUS_NONE) @@ -937,6 +937,7 @@ static int iqs5xx_fw_file_write(struct i2c_client *client, const char *fw_file) usleep_range(10000, 10100); } + error_bl = error; error = iqs5xx_dev_init(client); if (!error && iqs5xx->bl_status == IQS5XX_BL_STATUS_RESET) error = -EINVAL; @@ -948,6 +949,9 @@ static int iqs5xx_fw_file_write(struct i2c_client *client, const char *fw_file) err_kfree: kfree(pmap); + if (error_bl) + return error_bl; + return error; }
After user space writes the fw_file attribute to push new firmware to the device, the driver calls iqs5xx_dev_init() to re-initialize the device with the updated firmware or recover the device in case the update failed. In the case of the latter, however, iqs5xx_fw_file_write() returns zero (success) so long as iqs5xx_dev_init() does not fail, and any error encountered during the update process is lost. Solve this by saving the error before calling iqs5xx_dev_init(). Signed-off-by: Jeff LaBundy <jeff@labundy.com> --- drivers/input/touchscreen/iqs5xx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)