diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-02-20 05:56:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:11:05 -0500 |
commit | cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163 (patch) | |
tree | 94ed5180b0cfac0f1f256bbb5ed9e0fb2643d93f /drivers/media/video/hexium_orion.c | |
parent | 8d55662512127c84ac90873fb68ba44842e2c426 (diff) |
V4L/DVB: saa7146_vv: fix regression where v4l2_device was registered too late
v4l2_device_register needs to be called before the i2c subdevs are loaded.
However, it was called afterwards in the saa7146 driver. This caused an oops
when loading the mxb and hexium drivers. The vv_init function is now split
into two: one registers the v4l2_device, the other does the rest of the
initialization. The three drivers that depend on this have been updated to
call the new vv_devinit function.
Thanks to Michael Hunold for reporting this.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/hexium_orion.c')
-rw-r--r-- | drivers/media/video/hexium_orion.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c index 938a1f8f880a..fe596a1c12a8 100644 --- a/drivers/media/video/hexium_orion.c +++ b/drivers/media/video/hexium_orion.c | |||
@@ -216,6 +216,10 @@ static int hexium_probe(struct saa7146_dev *dev) | |||
216 | return -EFAULT; | 216 | return -EFAULT; |
217 | } | 217 | } |
218 | 218 | ||
219 | err = saa7146_vv_devinit(dev); | ||
220 | if (err) | ||
221 | return err; | ||
222 | |||
219 | hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL); | 223 | hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL); |
220 | if (NULL == hexium) { | 224 | if (NULL == hexium) { |
221 | printk("hexium_orion: hexium_probe: not enough kernel memory.\n"); | 225 | printk("hexium_orion: hexium_probe: not enough kernel memory.\n"); |