[media] msp3400: use IS_ENABLED check instead of #if
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Feb 2016 15:47:58 +0000 (13:47 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 2 Feb 2016 16:28:56 +0000 (14:28 -0200)
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: fb4932821731 ("[media] msp3400: initialize MC data")

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/i2c/msp3400-driver.h

index f0bb37dc90139d8641ed4f568845ca449bdc920c..a8702aca187a97176eac9c4b2795e1b9c2969872 100644 (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
 };