From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 26 Nov 2008 13:12:42 +0000 (+0100)
Subject: Merge branch 'topic/misc' into topic/pcsp-fix
X-Git-Tag: v2.6.29-rc1~590^2~9^2~3^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4;p=linux-2.6-omap-h63xx.git

Merge branch 'topic/misc' into topic/pcsp-fix

Conflicts:
	sound/drivers/pcsp/pcsp_lib.c
---

e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4
diff --cc sound/drivers/pcsp/pcsp_lib.c
index 1f42e406311,40f95f549d2..f8d8470861d
--- a/sound/drivers/pcsp/pcsp_lib.c
+++ b/sound/drivers/pcsp/pcsp_lib.c
@@@ -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;
  	}
@@@ -118,14 -116,10 +116,11 @@@
  	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;
  }