Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161411
b: refs/heads/master
c: 9817dc3
h: refs/heads/master
i:
  161409: 129ae77
  161407: b7d802b
v: v3
  • Loading branch information
Tobias Lorenz authored and Mauro Carvalho Chehab committed Sep 12, 2009
1 parent 9eac5e1 commit 568aa17
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 721f59ed612477a9f83f3f3a222a14d16505c1a4
refs/heads/master: 9817dc3133b8f75812b8b2c9e7a52c7c34f715d9
12 changes: 3 additions & 9 deletions trunk/drivers/media/radio/radio-si470x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1141,17 +1141,15 @@ static int si470x_fops_open(struct file *file)
goto done;
}

printk(KERN_INFO DRIVER_NAME
": Opened radio (users now: %i)\n", radio->users);

if (radio->users == 1) {
/* start radio */
retval = si470x_start(radio);
if (retval < 0) {
usb_autopm_put_interface(radio->intf);
goto done;
}
/* Initialize interrupt URB. */

/* initialize interrupt urb */
usb_fill_int_urb(radio->int_in_urb, radio->usbdev,
usb_rcvintpipe(radio->usbdev,
radio->int_in_endpoint->bEndpointAddress),
Expand All @@ -1171,7 +1169,6 @@ static int si470x_fops_open(struct file *file)
radio->int_in_running = 0;
usb_autopm_put_interface(radio->intf);
}

}

done:
Expand All @@ -1196,11 +1193,8 @@ static int si470x_fops_release(struct file *file)

mutex_lock(&radio->disconnect_lock);
radio->users--;
printk(KERN_INFO DRIVER_NAME
": Closed radio (remaining users:%i)\n", radio->users);
if (radio->users == 0) {

/* Shutdown Interrupt handler */
/* shutdown interrupt handler */
if (radio->int_in_running) {
radio->int_in_running = 0;
if (radio->int_in_urb)
Expand Down

0 comments on commit 568aa17

Please sign in to comment.