diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/radio/radio-si470x.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index 41f304325074..179ee86ec922 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
@@ -1141,9 +1141,6 @@ static int si470x_fops_open(struct file *file) | |||
1141 | goto done; | 1141 | goto done; |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | printk(KERN_INFO DRIVER_NAME | ||
1145 | ": Opened radio (users now: %i)\n", radio->users); | ||
1146 | |||
1147 | if (radio->users == 1) { | 1144 | if (radio->users == 1) { |
1148 | /* start radio */ | 1145 | /* start radio */ |
1149 | retval = si470x_start(radio); | 1146 | retval = si470x_start(radio); |
@@ -1151,7 +1148,8 @@ static int si470x_fops_open(struct file *file) | |||
1151 | usb_autopm_put_interface(radio->intf); | 1148 | usb_autopm_put_interface(radio->intf); |
1152 | goto done; | 1149 | goto done; |
1153 | } | 1150 | } |
1154 | /* Initialize interrupt URB. */ | 1151 | |
1152 | /* initialize interrupt urb */ | ||
1155 | usb_fill_int_urb(radio->int_in_urb, radio->usbdev, | 1153 | usb_fill_int_urb(radio->int_in_urb, radio->usbdev, |
1156 | usb_rcvintpipe(radio->usbdev, | 1154 | usb_rcvintpipe(radio->usbdev, |
1157 | radio->int_in_endpoint->bEndpointAddress), | 1155 | radio->int_in_endpoint->bEndpointAddress), |
@@ -1171,7 +1169,6 @@ static int si470x_fops_open(struct file *file) | |||
1171 | radio->int_in_running = 0; | 1169 | radio->int_in_running = 0; |
1172 | usb_autopm_put_interface(radio->intf); | 1170 | usb_autopm_put_interface(radio->intf); |
1173 | } | 1171 | } |
1174 | |||
1175 | } | 1172 | } |
1176 | 1173 | ||
1177 | done: | 1174 | done: |
@@ -1196,11 +1193,8 @@ static int si470x_fops_release(struct file *file) | |||
1196 | 1193 | ||
1197 | mutex_lock(&radio->disconnect_lock); | 1194 | mutex_lock(&radio->disconnect_lock); |
1198 | radio->users--; | 1195 | radio->users--; |
1199 | printk(KERN_INFO DRIVER_NAME | ||
1200 | ": Closed radio (remaining users:%i)\n", radio->users); | ||
1201 | if (radio->users == 0) { | 1196 | if (radio->users == 0) { |
1202 | 1197 | /* shutdown interrupt handler */ | |
1203 | /* Shutdown Interrupt handler */ | ||
1204 | if (radio->int_in_running) { | 1198 | if (radio->int_in_running) { |
1205 | radio->int_in_running = 0; | 1199 | radio->int_in_running = 0; |
1206 | if (radio->int_in_urb) | 1200 | if (radio->int_in_urb) |