summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-07-21 23:32:29 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-08-06 11:27:05 +0200
commit43663dc4f4300e6a4ff4dade9a17cef42e79232c (patch)
tree448b573f901401b9c86f0b3efe3ff14792b861e4 /drivers/media
parente3083c3f369700cd1eec3de93b8d8ec0918ff778 (diff)
downloadlinux-43663dc4f4300e6a4ff4dade9a17cef42e79232c.tar.bz2
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/meye/meye.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/pci/meye/meye.h b/drivers/media/pci/meye/meye.h
index c957d9b55f89..5fa6552cf93d 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