diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /drivers/media/radio/radio-aztech.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/media/radio/radio-aztech.c')
| -rw-r--r-- | drivers/media/radio/radio-aztech.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 3fe5504428c5..628c689e3ffe 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
| @@ -394,8 +394,7 @@ static int __init aztech_init(void) | |||
| 394 | mutex_init(&lock); | 394 | mutex_init(&lock); |
| 395 | aztech_radio.priv=&aztech_unit; | 395 | aztech_radio.priv=&aztech_unit; |
| 396 | 396 | ||
| 397 | if(video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1) | 397 | if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) { |
| 398 | { | ||
| 399 | release_region(io,2); | 398 | release_region(io,2); |
| 400 | return -EINVAL; | 399 | return -EINVAL; |
| 401 | } | 400 | } |