summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_controller.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-02-20 12:50:46 +0100
committerTakashi Iwai <tiwai@suse.de>2015-02-26 15:52:45 +0100
commit820cc6cf2c552155ea919e596a85e1f4e5dfa2b5 (patch)
treee6b75fc3f36ef14fd64d6f311c2f8e8c5391c8c5 /sound/pci/hda/hda_controller.h
parent7e40b80da452770878943edfe7da80f10f8d25da (diff)
ALSA: hda - Clear pcm pointer assigned to hda_pcm at device removal
We leave the pcm field of struct hda_pcm at removal of each device, so far. This hasn't been a problem since unbinding the codec driver isn't supposed to happen and another route via snd_hda_codec_reset() clears all the once. However, for a proper unbind implementation, we need to care about it. This patch does the thing above properly: - Include struct hda_pcm pointer instead of struct hda_pcm_stream pointers in struct azx_dev. This allows us to point the hda_pcm object at dev_free callback. - Introduce to_hda_pcm_stream() macro for better readability. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_controller.h')
-rw-r--r--sound/pci/hda/hda_controller.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index e4f46a21698a..94c1a4719f7f 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -283,7 +283,7 @@ struct azx_pcm {
struct azx *chip;
struct snd_pcm *pcm;
struct hda_codec *codec;
- struct hda_pcm_stream *hinfo[2];
+ struct hda_pcm *info;
struct list_head list;
};