Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148382
b: refs/heads/master
c: 04145f2
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed Jun 8, 2009
1 parent 20c0960 commit a929453
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09521d2e3edd0bf02b66e5b8c13f1559f2d6958a
refs/heads/master: 04145f2bfbc3ac4dbb71fa085b82380444d50b4f
9 changes: 6 additions & 3 deletions trunk/sound/pci/ctxfi/cttimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@

#include <linux/slab.h>
#include <linux/math64.h>
#include <linux/moduleparam.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include "ctatc.h"
#include "cthardware.h"
#include "cttimer.h"

static int use_system_timer;
MODULE_PARM_DESC(use_system_timer, "Foce to use system-timer");
module_param(use_system_timer, bool, S_IRUGO);

struct ct_timer_ops {
void (*init)(struct ct_timer_instance *);
void (*prepare)(struct ct_timer_instance *);
Expand Down Expand Up @@ -390,8 +395,6 @@ void ct_timer_instance_free(struct ct_timer_instance *ti)
* timer manager
*/

#define USE_SYSTEM_TIMER 0

static void ct_timer_interrupt(void *data, unsigned int status)
{
struct ct_timer *timer = data;
Expand All @@ -415,7 +418,7 @@ struct ct_timer *ct_timer_new(struct ct_atc *atc)
INIT_LIST_HEAD(&atimer->running_head);
atimer->atc = atc;
hw = atc->hw;
if (!USE_SYSTEM_TIMER && hw->set_timer_irq) {
if (!use_system_timer && hw->set_timer_irq) {
snd_printd(KERN_INFO "ctxfi: Use xfi-native timer\n");
atimer->ops = &ct_xfitimer_ops;
hw->irq_callback_data = atimer;
Expand Down

0 comments on commit a929453

Please sign in to comment.