diff options
Diffstat (limited to 'drivers/media/radio/radio-si470x.c')
-rw-r--r-- | drivers/media/radio/radio-si470x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index 3e1830293de5..67cbce82cb91 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
@@ -96,6 +96,8 @@ | |||
96 | * 2008-10-20 Alexey Klimov <klimov.linux@gmail.com> | 96 | * 2008-10-20 Alexey Klimov <klimov.linux@gmail.com> |
97 | * - add support for KWorld USB FM Radio FM700 | 97 | * - add support for KWorld USB FM Radio FM700 |
98 | * - blacklisted KWorld radio in hid-core.c and hid-ids.h | 98 | * - blacklisted KWorld radio in hid-core.c and hid-ids.h |
99 | * 2008-12-03 Mark Lord <mlord@pobox.com> | ||
100 | * - add support for DealExtreme USB Radio | ||
99 | * | 101 | * |
100 | * ToDo: | 102 | * ToDo: |
101 | * - add firmware download/update support | 103 | * - add firmware download/update support |
@@ -138,6 +140,8 @@ static struct usb_device_id si470x_usb_driver_id_table[] = { | |||
138 | { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) }, | 140 | { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) }, |
139 | /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */ | 141 | /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */ |
140 | { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) }, | 142 | { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) }, |
143 | /* DealExtreme USB Radio */ | ||
144 | { USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) }, | ||
141 | /* Terminating entry */ | 145 | /* Terminating entry */ |
142 | { } | 146 | { } |
143 | }; | 147 | }; |
@@ -1075,7 +1079,7 @@ static unsigned int si470x_fops_poll(struct file *file, | |||
1075 | /* | 1079 | /* |
1076 | * si470x_fops_open - file open | 1080 | * si470x_fops_open - file open |
1077 | */ | 1081 | */ |
1078 | static int si470x_fops_open(struct inode *inode, struct file *file) | 1082 | static int si470x_fops_open(struct file *file) |
1079 | { | 1083 | { |
1080 | struct si470x_device *radio = video_drvdata(file); | 1084 | struct si470x_device *radio = video_drvdata(file); |
1081 | int retval; | 1085 | int retval; |
@@ -1105,7 +1109,7 @@ done: | |||
1105 | /* | 1109 | /* |
1106 | * si470x_fops_release - file release | 1110 | * si470x_fops_release - file release |
1107 | */ | 1111 | */ |
1108 | static int si470x_fops_release(struct inode *inode, struct file *file) | 1112 | static int si470x_fops_release(struct file *file) |
1109 | { | 1113 | { |
1110 | struct si470x_device *radio = video_drvdata(file); | 1114 | struct si470x_device *radio = video_drvdata(file); |
1111 | int retval = 0; | 1115 | int retval = 0; |
@@ -1147,15 +1151,11 @@ done: | |||
1147 | /* | 1151 | /* |
1148 | * si470x_fops - file operations interface | 1152 | * si470x_fops - file operations interface |
1149 | */ | 1153 | */ |
1150 | static const struct file_operations si470x_fops = { | 1154 | static const struct v4l2_file_operations si470x_fops = { |
1151 | .owner = THIS_MODULE, | 1155 | .owner = THIS_MODULE, |
1152 | .llseek = no_llseek, | ||
1153 | .read = si470x_fops_read, | 1156 | .read = si470x_fops_read, |
1154 | .poll = si470x_fops_poll, | 1157 | .poll = si470x_fops_poll, |
1155 | .ioctl = video_ioctl2, | 1158 | .ioctl = video_ioctl2, |
1156 | #ifdef CONFIG_COMPAT | ||
1157 | .compat_ioctl = v4l_compat_ioctl32, | ||
1158 | #endif | ||
1159 | .open = si470x_fops_open, | 1159 | .open = si470x_fops_open, |
1160 | .release = si470x_fops_release, | 1160 | .release = si470x_fops_release, |
1161 | }; | 1161 | }; |