diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /drivers/media/radio/radio-si470x.c | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/radio/radio-si470x.c')
| -rw-r--r-- | drivers/media/radio/radio-si470x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index a4984ff87c9c..16c7ef20265c 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
| @@ -1694,8 +1694,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, | |||
| 1694 | INIT_DELAYED_WORK(&radio->work, si470x_work); | 1694 | INIT_DELAYED_WORK(&radio->work, si470x_work); |
| 1695 | 1695 | ||
| 1696 | /* register video device */ | 1696 | /* register video device */ |
| 1697 | if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) { | 1697 | retval = video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr); |
| 1698 | retval = -EIO; | 1698 | if (retval) { |
| 1699 | printk(KERN_WARNING DRIVER_NAME | 1699 | printk(KERN_WARNING DRIVER_NAME |
| 1700 | ": Could not register video device\n"); | 1700 | ": Could not register video device\n"); |
| 1701 | goto err_all; | 1701 | goto err_all; |