diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
commit | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch) | |
tree | 16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/usb/endpoint.h | |
parent | c9adeefda0e29bed628e40e7f9da1f84243937e7 (diff) | |
parent | 8bb4d9ce08b0a92ca174e41d92c180328f86173f (diff) | |
download | linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.gz linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.bz2 linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/endpoint.h')
-rw-r--r-- | sound/usb/endpoint.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h index 6376ccf10fd4..3d4c9705041f 100644 --- a/sound/usb/endpoint.h +++ b/sound/usb/endpoint.h @@ -19,6 +19,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int can_sleep); void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, int force, int can_sleep, int wait); +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_free(struct list_head *head); |