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

Input: drv2667 - fix misuse of regmap_update_bits

Using regmap_update_bits(..., mask, 1) with 'mask' following (1 << k)
and k greater than 0 is wrong. Indeed, _regmap_update_bits will perform
(mask & 1), which results in 0 if LSB of mask is 0. Thus the call
regmap_update_bits(..., mask, 1) is in reality equivalent to
regmap_update_bits(..., mask, 0).

In such a case, the correct use is regmap_update_bits(..., mask, mask).

This driver is performing such a mistake with the DRV2667_STANDBY mask,
which equals (1 << 6). Fix the driver to make it consistent with the
API, and fix the alignment problem at the same time. Please note that
this change is untested, as I do not have this piece of hardware.
Testers are welcome!

Signed-off-by: Florian Vaussard <florian.vaussard@heig-vd.ch>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Florian Vaussard and committed by
Dmitry Torokhov
6473bbfd 037b3af6

+2 -2
+2 -2
drivers/input/misc/drv2667.c
··· 256 256 cancel_work_sync(&haptics->work); 257 257 258 258 error = regmap_update_bits(haptics->regmap, DRV2667_CTRL_2, 259 - DRV2667_STANDBY, 1); 259 + DRV2667_STANDBY, DRV2667_STANDBY); 260 260 if (error) 261 261 dev_err(&haptics->client->dev, 262 262 "Failed to enter standby mode: %d\n", error); ··· 415 415 416 416 if (haptics->input_dev->users) { 417 417 ret = regmap_update_bits(haptics->regmap, DRV2667_CTRL_2, 418 - DRV2667_STANDBY, 1); 418 + DRV2667_STANDBY, DRV2667_STANDBY); 419 419 if (ret) { 420 420 dev_err(dev, "Failed to set standby mode\n"); 421 421 regulator_disable(haptics->regulator);