Commit 5c76c794 authored by Dan Carpenter's avatar Dan Carpenter Committed by Douglas Anderson
Browse files

HID: i2c-hid: Fix test in i2c_hid_core_register_panel_follower() 



Bitwise AND was intended instead of OR.  With the current code the
condition is always true.

Fixes: cbdd16b8 ("HID: i2c-hid: Make elan touch controllers power on after panel is enabled")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarPin-yen Lin <treapking@chromium.org>
Acked-by: default avatarJiri Kosina <jkosina@suse.com>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/aK8Au3CgZSTvfEJ6@stanley.mountain
parent 1e00a12d

drivers/hid/i2c-hid/i2c-hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,7 @@ static int i2c_hid_core_register_panel_follower(struct i2c_hid *ihid) 
	struct device *dev = &ihid->client->dev;

	int ret;



	if (ihid->hid->initial_quirks | HID_QUIRK_POWER_ON_AFTER_BACKLIGHT)

	if (ihid->hid->initial_quirks & HID_QUIRK_POWER_ON_AFTER_BACKLIGHT)

		ihid->panel_follower.funcs = &i2c_hid_core_panel_follower_enable_funcs;

	else

		ihid->panel_follower.funcs = &i2c_hid_core_panel_follower_prepare_funcs;