diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:44 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:44 +0200 |
| commit | 366890df46c2fd9492c04fe3a8775447b7b053e4 (patch) | |
| tree | 57636b800255477ab3a51dcfaa59201c8c0ee38a /sound/pci/ctxfi/ctpcm.c | |
| parent | 70052413e7b432ccef8ee82340fc01831a1a290c (diff) | |
| parent | 29959a09cc1aabd2d5f4f03afc0305de6bd29248 (diff) | |
| download | linux-366890df46c2fd9492c04fe3a8775447b7b053e4.tar.gz linux-366890df46c2fd9492c04fe3a8775447b7b053e4.tar.bz2 linux-366890df46c2fd9492c04fe3a8775447b7b053e4.zip | |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi:
ALSA: ctxfi - Add PM support
ALSA: ctxfi - Allow unknown PCI SSIDs
Diffstat (limited to 'sound/pci/ctxfi/ctpcm.c')
| -rw-r--r-- | sound/pci/ctxfi/ctpcm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c index 9e5c0c4da726..60ea23180acb 100644 --- a/sound/pci/ctxfi/ctpcm.c +++ b/sound/pci/ctxfi/ctpcm.c @@ -422,5 +422,9 @@ int ct_alsa_pcm_create(struct ct_atc *atc, snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(atc->pci), 128*1024, 128*1024); +#ifdef CONFIG_PM + atc->pcms[device] = pcm; +#endif + return 0; } |