Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: magn: bmc150_magn: do not set power state twice when setting trigger state

When setting the trigger state, the device power state is set through
buffer preenable and postdisable hooks. There is no need
to also set it in the trigger set state call.

Remove duplicate set power state from the trigger set
state call.

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Irina Tirdea and committed by
Jonathan Cameron
5ab744d0 019cc46d

+2 -8
+2 -8
drivers/iio/magnetometer/bmc150_magn.c
··· 784 784 if (state == data->dready_trigger_on) 785 785 goto err_unlock; 786 786 787 - ret = bmc150_magn_set_power_state(data, state); 788 - if (ret < 0) 789 - goto err_unlock; 790 - 791 787 ret = regmap_update_bits(data->regmap, BMC150_MAGN_REG_INT_DRDY, 792 788 BMC150_MAGN_MASK_DRDY_EN, 793 789 state << BMC150_MAGN_SHIFT_DRDY_EN); 794 790 if (ret < 0) 795 - goto err_poweroff; 791 + goto err_unlock; 796 792 797 793 data->dready_trigger_on = state; 798 794 799 795 if (state) { 800 796 ret = bmc150_magn_reset_intr(data); 801 797 if (ret < 0) 802 - goto err_poweroff; 798 + goto err_unlock; 803 799 } 804 800 mutex_unlock(&data->mutex); 805 801 806 802 return 0; 807 803 808 - err_poweroff: 809 - bmc150_magn_set_power_state(data, false); 810 804 err_unlock: 811 805 mutex_unlock(&data->mutex); 812 806 return ret;