git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: add fault injection mechanism for faking request timeouts
[safe/jmp/linux-2.6]
/
drivers
/
media
/
radio
/
radio-terratec.c
diff --git
a/drivers/media/radio/radio-terratec.c
b/drivers/media/radio/radio-terratec.c
index
3a67471
..
0876fec
100644
(file)
--- a/
drivers/media/radio/radio-terratec.c
+++ b/
drivers/media/radio/radio-terratec.c
@@
-383,9
+383,7
@@
static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
};
static struct video_device terratec_radio = {
};
static struct video_device terratec_radio = {
- .owner = THIS_MODULE,
.name = "TerraTec ActiveRadio",
.name = "TerraTec ActiveRadio",
- .type = VID_TYPE_TUNER,
.fops = &terratec_fops,
.ioctl_ops = &terratec_ioctl_ops,
};
.fops = &terratec_fops,
.ioctl_ops = &terratec_ioctl_ops,
};
@@
-407,8
+405,7
@@
static int __init terratec_init(void)
spin_lock_init(&lock);
spin_lock_init(&lock);
- if(video_register_device(&terratec_radio, VFL_TYPE_RADIO, radio_nr)==-1)
- {
+ if (video_register_device(&terratec_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
release_region(io,2);
return -EINVAL;
}
release_region(io,2);
return -EINVAL;
}