X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/94b8e4f0425cebad0a186daf054168fa6910f9b8..91dfab84182937b62ef64cb12d8e4f89e6d5c3ec:/lincan/src/sja1000p.c diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c index bc2fcc3..b34e984 100644 --- a/lincan/src/sja1000p.c +++ b/lincan/src/sja1000p.c @@ -691,11 +691,11 @@ irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs) int sja1000p_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj) { /* dummy lock to prevent preemption fully portable way */ - spinlock_t dummy_lock; + can_spinlock_t dummy_lock; /* preempt_disable() */ - spin_lock_init(&dummy_lock); - spin_lock(&dummy_lock); + can_spin_lock_init(&dummy_lock); + can_spin_lock(&dummy_lock); set_bit(OBJ_TX_REQUEST,&obj->flags); while(!test_and_set_bit(OBJ_TX_LOCK,&obj->flags)){ @@ -712,7 +712,7 @@ int sja1000p_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj) } /* preempt_enable(); */ - spin_unlock(&dummy_lock); + can_spin_unlock(&dummy_lock); return 0; }