diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/endpoint.c | 15 | ||||
| -rw-r--r-- | sound/usb/endpoint.h | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index e84732c..2685660 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -946,28 +946,23 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep) * * @ep: the endpoint to deactivate * - * If the endpoint is not currently in use, this functions will select the - * alternate interface setting 0 for the interface of this endpoint. + * If the endpoint is not currently in use, this functions will + * deactivate its associated URBs. * * In case of any active users, this functions does nothing. - * - * Returns an error if usb_set_interface() failed, 0 in all other - * cases. */ -int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep) +void snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep) { if (!ep) - return -EINVAL; + return; if (ep->use_count != 0) - return 0; + return; deactivate_urbs(ep, true); wait_clear_urbs(ep); clear_bit(EP_FLAG_ACTIVATED, &ep->flags); - - return 0; } /** diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h index 3bd02f0..1c7e8ee 100644 --- a/sound/usb/endpoint.h +++ b/sound/usb/endpoint.h @@ -22,7 +22,7 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep); void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep); void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep); int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); -int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); +void snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); void snd_usb_endpoint_free(struct list_head *head); int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep); |