openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] msp3400: use IS_ENABLED check instead of #if 

A recent patch broke the msp3400 driver when CONFIG_MEDIA_CONTROLLER
is not set:

drivers/media/i2c/msp3400-driver.h:107:5: error: "CONFIG_MEDIA_CONTROLLER" is not defined [-Werror=undef]

It was clearly a typo, and this patch changes the
"#if CONFIG_MEDIA_CONTROLLER" to a working IS_ENABLED() check.

Fixes: fb49328217 ("[media] msp3400: initialize MC data")

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Arnd Bergmann 2016-02-02 13:47:58 -02:00 committed by Mauro Carvalho Chehab
parent 5ce625a42d
commit 24095e7660
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/i2c/msp3400-driver.h
View File

@ -104,7 +104,7 @@ struct msp_state {
unsigned int restart:1;
unsigned int watch_stereo:1;
#if CONFIG_MEDIA_CONTROLLER
#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS];
#endif
};