diff --git a/[refs] b/[refs] index 688ef24c95cd..78519f355b29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 721f59ed612477a9f83f3f3a222a14d16505c1a4 +refs/heads/master: 9817dc3133b8f75812b8b2c9e7a52c7c34f715d9 diff --git a/trunk/drivers/media/radio/radio-si470x.c b/trunk/drivers/media/radio/radio-si470x.c index 41f304325074..179ee86ec922 100644 --- a/trunk/drivers/media/radio/radio-si470x.c +++ b/trunk/drivers/media/radio/radio-si470x.c @@ -1141,9 +1141,6 @@ 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); @@ -1151,7 +1148,8 @@ static int si470x_fops_open(struct file *file) 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), @@ -1171,7 +1169,6 @@ static int si470x_fops_open(struct file *file) radio->int_in_running = 0; usb_autopm_put_interface(radio->intf); } - } done: @@ -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)