diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/endpoint.c | 14 | ||||
-rw-r--r-- | sound/usb/endpoint.h | 2 | ||||
-rw-r--r-- | sound/usb/pcm.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index b1f687f57ba5..7e9c55a73540 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c | |||
@@ -128,7 +128,7 @@ static const char *usb_error_string(int err) | |||
128 | * Determine whether an endpoint is driven by an implicit feedback | 128 | * Determine whether an endpoint is driven by an implicit feedback |
129 | * data endpoint source. | 129 | * data endpoint source. |
130 | */ | 130 | */ |
131 | int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep) | 131 | int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep) |
132 | { | 132 | { |
133 | return ep->sync_master && | 133 | return ep->sync_master && |
134 | ep->sync_master->type == SND_USB_ENDPOINT_TYPE_DATA && | 134 | ep->sync_master->type == SND_USB_ENDPOINT_TYPE_DATA && |
@@ -363,7 +363,7 @@ static void snd_complete_urb(struct urb *urb) | |||
363 | if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags))) | 363 | if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags))) |
364 | goto exit_clear; | 364 | goto exit_clear; |
365 | 365 | ||
366 | if (snd_usb_endpoint_implict_feedback_sink(ep)) { | 366 | if (snd_usb_endpoint_implicit_feedback_sink(ep)) { |
367 | unsigned long flags; | 367 | unsigned long flags; |
368 | 368 | ||
369 | spin_lock_irqsave(&ep->lock, flags); | 369 | spin_lock_irqsave(&ep->lock, flags); |
@@ -605,7 +605,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, | |||
605 | else | 605 | else |
606 | packs_per_ms = 1; | 606 | packs_per_ms = 1; |
607 | 607 | ||
608 | if (is_playback && !snd_usb_endpoint_implict_feedback_sink(ep)) { | 608 | if (is_playback && !snd_usb_endpoint_implicit_feedback_sink(ep)) { |
609 | urb_packs = max(ep->chip->nrpacks, 1); | 609 | urb_packs = max(ep->chip->nrpacks, 1); |
610 | urb_packs = min(urb_packs, (unsigned int) MAX_PACKS); | 610 | urb_packs = min(urb_packs, (unsigned int) MAX_PACKS); |
611 | } else { | 611 | } else { |
@@ -614,11 +614,11 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, | |||
614 | 614 | ||
615 | urb_packs *= packs_per_ms; | 615 | urb_packs *= packs_per_ms; |
616 | 616 | ||
617 | if (sync_ep && !snd_usb_endpoint_implict_feedback_sink(ep)) | 617 | if (sync_ep && !snd_usb_endpoint_implicit_feedback_sink(ep)) |
618 | urb_packs = min(urb_packs, 1U << sync_ep->syncinterval); | 618 | urb_packs = min(urb_packs, 1U << sync_ep->syncinterval); |
619 | 619 | ||
620 | /* decide how many packets to be used */ | 620 | /* decide how many packets to be used */ |
621 | if (is_playback && !snd_usb_endpoint_implict_feedback_sink(ep)) { | 621 | if (is_playback && !snd_usb_endpoint_implicit_feedback_sink(ep)) { |
622 | unsigned int minsize, maxpacks; | 622 | unsigned int minsize, maxpacks; |
623 | /* determine how small a packet can be */ | 623 | /* determine how small a packet can be */ |
624 | minsize = (ep->freqn >> (16 - ep->datainterval)) | 624 | minsize = (ep->freqn >> (16 - ep->datainterval)) |
@@ -845,7 +845,7 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep) | |||
845 | 845 | ||
846 | set_bit(EP_FLAG_RUNNING, &ep->flags); | 846 | set_bit(EP_FLAG_RUNNING, &ep->flags); |
847 | 847 | ||
848 | if (snd_usb_endpoint_implict_feedback_sink(ep)) { | 848 | if (snd_usb_endpoint_implicit_feedback_sink(ep)) { |
849 | for (i = 0; i < ep->nurbs; i++) { | 849 | for (i = 0; i < ep->nurbs; i++) { |
850 | struct snd_urb_ctx *ctx = ep->urb + i; | 850 | struct snd_urb_ctx *ctx = ep->urb + i; |
851 | list_add_tail(&ctx->ready_list, &ep->ready_playback_urbs); | 851 | list_add_tail(&ctx->ready_list, &ep->ready_playback_urbs); |
@@ -988,7 +988,7 @@ void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep, | |||
988 | * and add it to the list of pending urbs. queue_pending_output_urbs() | 988 | * and add it to the list of pending urbs. queue_pending_output_urbs() |
989 | * will take care of them later. | 989 | * will take care of them later. |
990 | */ | 990 | */ |
991 | if (snd_usb_endpoint_implict_feedback_sink(ep) && | 991 | if (snd_usb_endpoint_implicit_feedback_sink(ep) && |
992 | ep->use_count != 0) { | 992 | ep->use_count != 0) { |
993 | 993 | ||
994 | /* implicit feedback case */ | 994 | /* implicit feedback case */ |
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h index 447902dd8a4a..2287adf5ca59 100644 --- a/sound/usb/endpoint.h +++ b/sound/usb/endpoint.h | |||
@@ -23,7 +23,7 @@ int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); | |||
23 | int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); | 23 | int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); |
24 | void snd_usb_endpoint_free(struct list_head *head); | 24 | void snd_usb_endpoint_free(struct list_head *head); |
25 | 25 | ||
26 | int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep); | 26 | int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep); |
27 | int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep); | 27 | int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep); |
28 | 28 | ||
29 | void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep, | 29 | void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep, |
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 652724c12235..754cb5bb1f79 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c | |||
@@ -1271,7 +1271,7 @@ static void prepare_playback_urb(struct snd_usb_substream *subs, | |||
1271 | } | 1271 | } |
1272 | } | 1272 | } |
1273 | if (period_elapsed && | 1273 | if (period_elapsed && |
1274 | !snd_usb_endpoint_implict_feedback_sink(subs->data_endpoint)) /* finish at the period boundary */ | 1274 | !snd_usb_endpoint_implicit_feedback_sink(subs->data_endpoint)) /* finish at the period boundary */ |
1275 | break; | 1275 | break; |
1276 | } | 1276 | } |
1277 | bytes = frames * stride; | 1277 | bytes = frames * stride; |