diff options
Diffstat (limited to 'sound/pci/rme96.c')
-rw-r--r-- | sound/pci/rme96.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index dcfa4d7a73e2..42c6b5e09072 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -1868,10 +1868,7 @@ snd_rme96_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer | |||
1868 | 1868 | ||
1869 | static void snd_rme96_proc_init(struct rme96 *rme96) | 1869 | static void snd_rme96_proc_init(struct rme96 *rme96) |
1870 | { | 1870 | { |
1871 | struct snd_info_entry *entry; | 1871 | snd_card_ro_proc_new(rme96->card, "rme96", rme96, snd_rme96_proc_read); |
1872 | |||
1873 | if (! snd_card_proc_new(rme96->card, "rme96", &entry)) | ||
1874 | snd_info_set_text_ops(entry, rme96, snd_rme96_proc_read); | ||
1875 | } | 1872 | } |
1876 | 1873 | ||
1877 | /* | 1874 | /* |
@@ -2388,8 +2385,6 @@ static int rme96_suspend(struct device *dev) | |||
2388 | struct rme96 *rme96 = card->private_data; | 2385 | struct rme96 *rme96 = card->private_data; |
2389 | 2386 | ||
2390 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); | 2387 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); |
2391 | snd_pcm_suspend(rme96->playback_substream); | ||
2392 | snd_pcm_suspend(rme96->capture_substream); | ||
2393 | 2388 | ||
2394 | /* save capture & playback pointers */ | 2389 | /* save capture & playback pointers */ |
2395 | rme96->playback_pointer = readl(rme96->iobase + RME96_IO_GET_PLAY_POS) | 2390 | rme96->playback_pointer = readl(rme96->iobase + RME96_IO_GET_PLAY_POS) |