misc/bh1770glc: error handling in bh1770_power_state_store()
Subsystems (2)
PATCH 1/1 misc/bh1770glc: error handling in bh1770_power_state_store()
There was a signedness bug so "ret" was never less than zero and that breaks the error handling. Also in the original code it would overwrite ret and the result is still negative but it's bogus number instead of the correct error code.
Signed-off-by Dan Carpenter <[email protected]>
drivers/misc/bh1770glc.c +6 -2
@@ -649,7 +649,7 @@ static ssize_t bh1770_power_state_store(struct device *dev, {struct bh1770_chip *chip =dev_get_drvdata (dev);unsigned long value; -size_t ret; +ssize_t ret;if (strict_strtoul (buf,0 , &value))return -EINVAL ;
@@ -659,8 +659,12 @@ static ssize_t bh1770_power_state_store(struct device *dev,pm_runtime_get_sync (dev); ret =bh1770_lux_rate (chip, chip->lux_rate_index); - ret |=bh1770_lux_interrupt_control (chip,BH1770_ENABLE ); +if (ret <0 ) { +pm_runtime_put (dev); + goto leave; + } + ret =bh1770_lux_interrupt_control (chip,BH1770_ENABLE );if (ret <0 ) {pm_runtime_put (dev); goto leave;
Quoted 6 lines · ext Dan Carpenter
There was a signedness bug so "ret" was never less than zero and that breaks the error handling. Also in the original code it would overwrite ret and the result is still negative but it's bogus number instead of the correct error code.
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Samu Onkalo <[email protected]>
Quoted 28 lines
drivers/misc/bh1770glc.c +6
-2@@ -649,7 +649,7 @@ static ssize_t bh1770_power_state_store(struct device *dev, {struct bh1770_chip *chip =dev_get_drvdata (dev);unsigned long value; -size_t ret; +ssize_t ret;if (strict_strtoul (buf,0 , &value))return -EINVAL ;@@ -659,8 +659,12 @@ static ssize_t bh1770_power_state_store(struct device *dev,pm_runtime_get_sync (dev); ret =bh1770_lux_rate (chip, chip->lux_rate_index); - ret |=bh1770_lux_interrupt_control (chip,BH1770_ENABLE ); +if (ret <0 ) { +pm_runtime_put (dev); + goto leave; + } + ret =bh1770_lux_interrupt_control (chip,BH1770_ENABLE );if (ret <0 ) {pm_runtime_put (dev); goto leave;