diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-19 03:15:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-19 03:15:50 -0400 |
| commit | 5e51900be6c15488b80343d3c3e62d4d605ba9a9 (patch) | |
| tree | 99e60bbc949e066503b598893998286c8a42861d /drivers/media/radio/radio-gemtek.c | |
| parent | 998564789137921acae9e367b61c5a1dc295653d (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/cleanups
Diffstat (limited to 'drivers/media/radio/radio-gemtek.c')
| -rw-r--r-- | drivers/media/radio/radio-gemtek.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c index 2b1a6221de6d..0a0f956bb308 100644 --- a/drivers/media/radio/radio-gemtek.c +++ b/drivers/media/radio/radio-gemtek.c | |||
| @@ -612,8 +612,7 @@ static int __init gemtek_init(void) | |||
| 612 | 612 | ||
| 613 | gemtek_radio.priv = &gemtek_unit; | 613 | gemtek_radio.priv = &gemtek_unit; |
| 614 | 614 | ||
| 615 | if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO, | 615 | if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO, radio_nr) < 0) { |
| 616 | radio_nr) == -1) { | ||
| 617 | release_region(io, 1); | 616 | release_region(io, 1); |
| 618 | return -EBUSY; | 617 | return -EBUSY; |
| 619 | } | 618 | } |