diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
| commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
| tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /drivers/media/radio/dsbr100.c | |
| parent | 1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'drivers/media/radio/dsbr100.c')
| -rw-r--r-- | drivers/media/radio/dsbr100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 1ed88f3abe61..70c65a745923 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c | |||
| @@ -493,7 +493,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf, | |||
| 493 | radio->usbdev = interface_to_usbdev(intf); | 493 | radio->usbdev = interface_to_usbdev(intf); |
| 494 | radio->curfreq = FREQ_MIN*FREQ_MUL; | 494 | radio->curfreq = FREQ_MIN*FREQ_MUL; |
| 495 | video_set_drvdata(radio->videodev, radio); | 495 | video_set_drvdata(radio->videodev, radio); |
| 496 | if (video_register_device(radio->videodev, VFL_TYPE_RADIO,radio_nr)) { | 496 | if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) { |
| 497 | warn("Could not register video device"); | 497 | warn("Could not register video device"); |
| 498 | video_device_release(radio->videodev); | 498 | video_device_release(radio->videodev); |
| 499 | kfree(radio->transfer_buffer); | 499 | kfree(radio->transfer_buffer); |