diff --git a/[refs] b/[refs] index a2f5adf93180..023bbc152a34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae +refs/heads/master: 946cda7d64b81053beac5d31148996f3e379e89e diff --git a/trunk/sound/ppc/pmac.c b/trunk/sound/ppc/pmac.c index 6f68ac9982e4..a38c0c790d2b 100644 --- a/trunk/sound/ppc/pmac.c +++ b/trunk/sound/ppc/pmac.c @@ -214,7 +214,7 @@ static int snd_pmac_pcm_prepare(struct snd_pmac *chip, struct pmac_stream *rec, int rate_index; long offset; struct pmac_stream *astr; - + rec->dma_size = snd_pcm_lib_buffer_bytes(subs); rec->period_size = snd_pcm_lib_period_bytes(subs); rec->nperiods = rec->dma_size / rec->period_size; @@ -643,7 +643,7 @@ static int snd_pmac_pcm_close(struct snd_pmac *chip, struct pmac_stream *rec, /* reset constraints */ astr->cur_freqs = chip->freqs_ok; astr->cur_formats = chip->formats_ok; - + return 0; }