diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-02-20 07:56:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:11:05 -0300 |
| commit | cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163 (patch) | |
| tree | 94ed5180b0cfac0f1f256bbb5ed9e0fb2643d93f /drivers/media/common | |
| parent | 8d55662512127c84ac90873fb68ba44842e2c426 (diff) | |
| download | kernel_samsung_smdk4412-cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163.zip kernel_samsung_smdk4412-cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163.tar.gz kernel_samsung_smdk4412-cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163.tar.bz2 | |
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/common')
| -rw-r--r-- | drivers/media/common/saa7146_fops.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 7364b96..fd8e1f4 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c @@ -423,14 +423,15 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status) } } +int saa7146_vv_devinit(struct saa7146_dev *dev) +{ + return v4l2_device_register(&dev->pci->dev, &dev->v4l2_dev); +} +EXPORT_SYMBOL_GPL(saa7146_vv_devinit); + int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) { struct saa7146_vv *vv; - int err; - - err = v4l2_device_register(&dev->pci->dev, &dev->v4l2_dev); - if (err) - return err; vv = kzalloc(sizeof(struct saa7146_vv), GFP_KERNEL); if (vv == NULL) { |