diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-08-03 08:10:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-08-03 08:10:08 +0200 |
| commit | 3b5d1afd1f13bcab85eaa28223ad396694f929e3 (patch) | |
| tree | 02983e414b3d918114c15b8410ab46c245a07a29 /sound/usb/pcm.c | |
| parent | f1ec5be17b9aafbc5f573da023850566b43d8e5e (diff) | |
| parent | 2ac82e20e2377fb0b63ce40bba56558f2df7cd3e (diff) | |
| download | lwn-3b5d1afd1f13bcab85eaa28223ad396694f929e3.tar.gz lwn-3b5d1afd1f13bcab85eaa28223ad396694f929e3.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/usb/pcm.c')
| -rw-r--r-- | sound/usb/pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index a69d9e75f66f..415bfec49a01 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1696,8 +1696,8 @@ static void retire_playback_urb(struct snd_usb_substream *subs, int processed = urb->transfer_buffer_length / ep->stride; int est_delay; - /* ignore the delay accounting when procssed=0 is given, i.e. - * silent payloads are procssed before handling the actual data + /* ignore the delay accounting when processed=0 is given, i.e. + * silent payloads are processed before handling the actual data */ if (!processed) return; @@ -1744,7 +1744,7 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea switch (cmd) { case SNDRV_PCM_TRIGGER_START: subs->trigger_tstamp_pending_update = true; - /* fall through */ + fallthrough; case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: subs->data_endpoint->prepare_data_urb = prepare_playback_urb; subs->data_endpoint->retire_data_urb = retire_playback_urb; |