diff options
| author | Takashi Iwai | 2017-11-13 15:43:04 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2017-11-13 15:43:13 +0100 |
| commit | c429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch) | |
| tree | 80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /sound/core/pcm_native.c | |
| parent | ALSA: hda - fix headset mic problem for Dell machines with alc274 (diff) | |
| parent | ALSA: ice1712: define i2c eeprom addr to header file (diff) | |
| download | kernel-qcow2-linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.gz kernel-qcow2-linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.xz kernel-qcow2-linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.zip | |
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 2fec2feac387..a4d92e46c459 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -195,7 +195,6 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore); int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info) { - struct snd_pcm_runtime *runtime; struct snd_pcm *pcm = substream->pcm; struct snd_pcm_str *pstr = substream->pstr; @@ -211,7 +210,6 @@ int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info) info->subdevices_count = pstr->substream_count; info->subdevices_avail = pstr->substream_count - pstr->substream_opened; strlcpy(info->subname, substream->name, sizeof(info->subname)); - runtime = substream->runtime; return 0; } |