diff options
author | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /drivers/media/radio/radio-trust.c | |
parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/radio/radio-trust.c')
-rw-r--r-- | drivers/media/radio/radio-trust.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c index d70172d23edb..193161956253 100644 --- a/drivers/media/radio/radio-trust.c +++ b/drivers/media/radio/radio-trust.c @@ -378,8 +378,7 @@ static int __init trust_init(void) printk(KERN_ERR "trust: port 0x%x already in use\n", io); return -EBUSY; } - if(video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr)==-1) - { + if (video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr) < 0) { release_region(io, 2); return -EINVAL; } |