This is a note to let you know that I've just added the patch titled
Input: da7280 - protect OF match table with CONFIG_OF
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
input-da7280-protect-of-match-table-with-config_of.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 3161079cdd695d9da762bf0f5ee13b97af3e1f95
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Fri Dec 18 10:01:33 2020 -0800
Input: da7280 - protect OF match table with CONFIG_OF
[ Upstream commit 6d2ad82fece2f5adcafe77252614fcf7211dec28 ]
The OF match table is only used when OF is enabled.
Fixes: cd3f609823a5 ("Input: new da7280 haptic driver")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Acked-by: Roy Im <roy.im.opensource@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/X9xRLVPt9eBi0CT6@xxxxxxxxxx
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
index 2f698a8c1d650..b08610d6e575e 100644
--- a/drivers/input/misc/da7280.c
+++ b/drivers/input/misc/da7280.c
@@ -1300,11 +1300,13 @@ static int __maybe_unused da7280_resume(struct device *dev)
return retval;
}
+#ifdef CONFIG_OF
static const struct of_device_id da7280_of_match[] = {
{ .compatible = "dlg,da7280", },
{ }
};
MODULE_DEVICE_TABLE(of, da7280_of_match);
+#endif
static const struct i2c_device_id da7280_i2c_id[] = {
{ "da7280", },
