From ee4b20ca6e1d93e70fc12d7ee52533bb4e9a9078 Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Sun, 18 Jul 2010 23:26:29 -0300 Subject: [PATCH] --- yaml --- r: 208135 b: refs/heads/master c: d6b1850d3c49e66f17bbb67f964a48b11528f56b h: refs/heads/master i: 208133: a368bfb98567d714aab88f6b328599c268800d87 208131: 9b3f846d6321b7a6e613c0978fff649f6772be95 208127: f2c2be7b7e7d553437153cce850ddb349304fb32 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-cards.c | 5 ++++- trunk/drivers/media/video/cx23885/cx23885.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 76aab6a50f52..117578207c47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52fd3dda130d03ae5c2bbdcbe81f6e083c051e12 +refs/heads/master: d6b1850d3c49e66f17bbb67f964a48b11528f56b diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c index e9586743692b..b083e5dfb715 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-cards.c +++ b/trunk/drivers/media/video/cx23885/cx23885-cards.c @@ -1192,7 +1192,10 @@ void cx23885_card_setup(struct cx23885_dev *dev) dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_bus[2].i2c_adap, "cx25840", "cx25840", 0x88 >> 1, NULL); - v4l2_subdev_call(dev->sd_cx25840, core, load_fw); + if (dev->sd_cx25840) { + dev->sd_cx25840->grp_id = CX23885_HW_AV_CORE; + v4l2_subdev_call(dev->sd_cx25840, core, load_fw); + } break; } diff --git a/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h index a33f2b71467b..460f430d028f 100644 --- a/trunk/drivers/media/video/cx23885/cx23885.h +++ b/trunk/drivers/media/video/cx23885/cx23885.h @@ -403,7 +403,8 @@ static inline struct cx23885_dev *to_cx23885(struct v4l2_device *v4l2_dev) #define call_all(dev, o, f, args...) \ v4l2_device_call_all(&dev->v4l2_dev, 0, o, f, ##args) -#define CX23885_HW_888_IR (1 << 0) +#define CX23885_HW_888_IR (1 << 0) +#define CX23885_HW_AV_CORE (1 << 1) #define call_hw(dev, grpid, o, f, args...) \ v4l2_device_call_all(&dev->v4l2_dev, grpid, o, f, ##args)