diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
| commit | f81b691a3df09806385ea413c3a2ee094c705ca3 (patch) | |
| tree | 01c0d6d319fcbddc98171d06cfe8e742cd270455 /drivers/media/radio/radio-zoltrix.c | |
| parent | 110e0358e7dfd9cc56d47077068f3680dae10b56 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/pat
Diffstat (limited to 'drivers/media/radio/radio-zoltrix.c')
| -rw-r--r-- | drivers/media/radio/radio-zoltrix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c index 9f17a332fa11..51d57ed3b3e1 100644 --- a/drivers/media/radio/radio-zoltrix.c +++ b/drivers/media/radio/radio-zoltrix.c | |||
| @@ -446,8 +446,7 @@ static int __init zoltrix_init(void) | |||
| 446 | return -EBUSY; | 446 | return -EBUSY; |
| 447 | } | 447 | } |
| 448 | 448 | ||
| 449 | if (video_register_device(&zoltrix_radio, VFL_TYPE_RADIO, radio_nr) == -1) | 449 | if (video_register_device(&zoltrix_radio, VFL_TYPE_RADIO, radio_nr) < 0) { |
| 450 | { | ||
| 451 | release_region(io, 2); | 450 | release_region(io, 2); |
| 452 | return -EINVAL; | 451 | return -EINVAL; |
| 453 | } | 452 | } |