← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to sound/core/pcm_lib.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/core/pcm_lib.c
375
375
        }
376
376
 
377
377
        if (runtime->no_period_wakeup) {
 
378
                snd_pcm_sframes_t xrun_threshold;
378
379
                /*
379
380
                 * Without regular period interrupts, we have to check
380
381
                 * the elapsed time to detect xruns.
383
384
                if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)
384
385
                        goto no_delta_check;
385
386
                hdelta = jdelta - delta * HZ / runtime->rate;
386
 
                while (hdelta > runtime->hw_ptr_buffer_jiffies / 2 + 1) {
 
387
                xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1;
 
388
                while (hdelta > xrun_threshold) {
387
389
                        delta += runtime->buffer_size;
388
390
                        hw_base += runtime->buffer_size;
389
391
                        if (hw_base >= runtime->boundary)