diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
| commit | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch) | |
| tree | b2a44e08e9e683078e9d20d6072a513798788314 /drivers/media/radio/radio-maestro.c | |
| parent | 4931445b94f49672028b81ace9d4eee8ddf19ab2 (diff) | |
| parent | da1f026b532ce944d74461497dc6d8c16456466e (diff) | |
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'drivers/media/radio/radio-maestro.c')
| -rw-r--r-- | drivers/media/radio/radio-maestro.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index 08f1051979c..6af61bfeb17 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c @@ -299,7 +299,7 @@ static int vidioc_s_audio(struct file *file, void *priv, static const struct v4l2_file_operations maestro_fops = { .owner = THIS_MODULE, - .ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2, }; static const struct v4l2_ioctl_ops maestro_ioctl_ops = { @@ -383,22 +383,20 @@ static int __devinit maestro_probe(struct pci_dev *pdev, dev->vdev.release = video_device_release_empty; video_set_drvdata(&dev->vdev, dev); + if (!radio_power_on(dev)) { + retval = -EIO; + goto errfr1; + } + retval = video_register_device(&dev->vdev, VFL_TYPE_RADIO, radio_nr); if (retval) { v4l2_err(v4l2_dev, "can't register video device!\n"); goto errfr1; } - if (!radio_power_on(dev)) { - retval = -EIO; - goto errunr; - } - v4l2_info(v4l2_dev, "version " DRIVER_VERSION "\n"); return 0; -errunr: - video_unregister_device(&dev->vdev); errfr1: v4l2_device_unregister(v4l2_dev); errfr: |