]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'topic/misc' into topic/pcsp-fix
authorTakashi Iwai <tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000 (14:12 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000 (14:12 +0100)
Conflicts:
sound/drivers/pcsp/pcsp_lib.c

1  2 
include/sound/core.h
sound/drivers/pcsp/pcsp_lib.c

Simple merge
index 1f42e406311835a5c98aae272d9969ec6d5aa61b,40f95f549d2bb5739a7e777e1b27c3acdda3a3f0..f8d8470861dac9fa99dc4f7a4db179dd20e9a962
@@@ -33,8 -51,8 +51,8 @@@ enum hrtimer_restart pcsp_do_timer(stru
                outb(chip->val61, 0x61);
                chip->thalf = 0;
                if (!atomic_read(&chip->timer_active))
-                       return HRTIMER_NORESTART;
+                       goto stop;
 -              hrtimer_forward(&chip->timer, chip->timer.expires,
 +              hrtimer_forward(&chip->timer, hrtimer_get_expires(&chip->timer),
                                ktime_set(0, chip->ns_rem));
                return HRTIMER_RESTART;
        }
        chip->ns_rem = PCSP_PERIOD_NS();
        ns = (chip->thalf ? PCSP_CALC_NS(timer_cnt) : chip->ns_rem);
        chip->ns_rem -= ns;
 -      hrtimer_forward(&chip->timer, chip->timer.expires, ktime_set(0, ns));
 +      hrtimer_forward(&chip->timer, hrtimer_get_expires(&chip->timer),
 +                                                      ktime_set(0, ns));
        return HRTIMER_RESTART;
  
- exit_nr_unlock2:
-       snd_pcm_stream_unlock(substream);
- exit_nr_unlock1:
-       spin_unlock_irq(&chip->substream_lock);
+  stop:
        return HRTIMER_NORESTART;
  }