diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-26 12:13:04 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-26 12:13:04 -0500 |
| commit | d0d2c38e3963f4f86a9e62d74f45a371458f2787 (patch) | |
| tree | 8ab868d67fcd4151e9b7a8158edc0cb2e1a19f66 /sound/core/oss/pcm_oss.c | |
| parent | cf944ee55cc318bdb1d4b2f3f5cce3257f7c07b3 (diff) | |
| parent | e7636925789b042ff9d98c51d48392e8c5549480 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/core/oss/pcm_oss.c')
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 255ad910077a..82d4e3329b3d 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
| @@ -635,8 +635,7 @@ static long snd_pcm_alsa_frames(struct snd_pcm_substream *substream, long bytes) | |||
| 635 | static inline | 635 | static inline |
| 636 | snd_pcm_uframes_t get_hw_ptr_period(struct snd_pcm_runtime *runtime) | 636 | snd_pcm_uframes_t get_hw_ptr_period(struct snd_pcm_runtime *runtime) |
| 637 | { | 637 | { |
| 638 | snd_pcm_uframes_t ptr = runtime->status->hw_ptr; | 638 | return runtime->hw_ptr_interrupt; |
| 639 | return ptr - (ptr % runtime->period_size); | ||
| 640 | } | 639 | } |
| 641 | 640 | ||
| 642 | /* define extended formats in the recent OSS versions (if any) */ | 641 | /* define extended formats in the recent OSS versions (if any) */ |