From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Date: Tue, 21 Jul 2020 21:32:29 +0000 (+0200)
Subject: media: meye: fix missing pm_mchip_mode field
X-Git-Tag: v5.9-rc1~94^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43663dc4f4300e6a4ff4dade9a17cef42e79232c;p=thirdparty%2Fkernel%2Flinux.git

media: meye: fix missing pm_mchip_mode field

After commit 9c4a8489ab7c ("media: meye: use generic power management")
the pm_mchip_mode field should now always be present, even if CONFIG_PM
is not set.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: kernel test robot <lkp@intel.com>
Fixes: 9c4a8489ab7c ("media: meye: use generic power management")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/media/pci/meye/meye.h b/drivers/media/pci/meye/meye.h
index c957d9b55f894..5fa6552cf93d8 100644
--- a/drivers/media/pci/meye/meye.h
+++ b/drivers/media/pci/meye/meye.h
@@ -305,9 +305,7 @@ struct meye {
 	u16 colour;
 	struct meye_params params;	/* additional parameters */
 	unsigned long in_use;		/* set to 1 if the device is in use */
-#ifdef CONFIG_PM
 	u8 pm_mchip_mode;		/* old mchip mode */
-#endif
 };
 
 #endif