[media] cx231xx: fix compilation if the media controller is not defined

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

drivers/media/usb/cx231xx/cx231xx-cards.c: In function ‘cx231xx_usb_probe’:
drivers/media/usb/cx231xx/cx231xx-cards.c:1589:15: error: ‘struct v4l2_device’ has no member named ‘mdev’
dev->v4l2_dev.mdev = dev->media_dev;
^
drivers/media/usb/cx231xx/cx231xx-cards.c:1589:26: error: ‘struct cx231xx’ has no member named ‘media_dev’
dev->v4l2_dev.mdev = dev->media_dev;
^
scripts/Makefile.build:257: recipe for target 'drivers/media/usb/cx231xx/cx231xx-cards.o' failed

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Mauro Carvalho Chehab 11 years ago 63ba8c75 c1bd57d3

2 changed files

expand all

drivers

media

usb

cx231xx

cx231xx-cards.c

cx231xx-dvb.c

drivers/media/usb/cx231xx/cx231xx-cards.c

··· 1586 1586 cx231xx_media_device_register(dev, udev); 1587 1587 1588 1588 /* Create v4l2 device */ 1589 + #ifdef CONFIG_MEDIA_CONTROLLER 1589 1590 dev->v4l2_dev.mdev = dev->media_dev; 1591 + #endif 1590 1592 retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); 1591 1593 if (retval) { 1592 1594 dev_err(d, "v4l2_device_register failed\n");

drivers/media/usb/cx231xx/cx231xx-dvb.c

··· 540 540 541 541 /* register network adapter */ 542 542 dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); 543 + #ifdef CONFIG_MEDIA_CONTROLLER_DVB 543 544 dvb_create_media_graph(dev->media_dev); 545 + #endif 544 546 return 0; 545 547 546 548 fail_fe_conn: