diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-20 07:53:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-20 07:53:07 +0200 |
| commit | 7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8 (patch) | |
| tree | 6c5c7d9e05ef0d494265ef924ac909c959101fba /sound/firewire/amdtp-stream.h | |
| parent | ALSA: line6: remove unnecessary initialization to PODHD500X (diff) | |
| parent | ALSA: hda - Apply quirks to Broxton-T, too (diff) | |
| download | linux-7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8.tar.xz linux-7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/firewire/amdtp-stream.h')
| -rw-r--r-- | sound/firewire/amdtp-stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h index 6d613f2eb612..ed6eafd10992 100644 --- a/sound/firewire/amdtp-stream.h +++ b/sound/firewire/amdtp-stream.h @@ -135,7 +135,7 @@ struct amdtp_stream { /* For a PCM substream processing. */ struct snd_pcm_substream *pcm; struct tasklet_struct period_tasklet; - unsigned int pcm_buffer_pointer; + snd_pcm_uframes_t pcm_buffer_pointer; unsigned int pcm_period_pointer; /* To wait for first packet. */ |