X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c316aed80a2047f337dc0cff35e2458c4cb13eca..ca4ad65fe791cd40f1dcec6d0398fd74b31051cd:/lincan/src/smartcan.c

diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index abbbe1a..4d638f9 100644
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -16,6 +16,8 @@
 int smartcan_irq=-1;
 unsigned long smartcan_base=0x0;
 
+static can_spinlock_t smartcan_port_lock=SPIN_LOCK_UNLOCKED;
+
 int smartcan_request_io(struct candevice_t *candev)
 {
 	if (!can_request_io_region(candev->io_addr,0x04,DEVICE_NAME)) {
@@ -100,19 +102,21 @@ int smartcan_init_obj_data(struct chip_t *chip, int objnr)
 
 void smartcan_write_register(unsigned char data, unsigned long address)
 {
-	can_disable_irq(smartcan_irq);
+	can_spin_irqflags_t flags;
+	can_spin_lock_irqsave(&smartcan_port_lock,flags);
 	outb(address-smartcan_base,smartcan_base);
 	outb(data,smartcan_base+1);
-	can_enable_irq(smartcan_irq);
+	can_spin_unlock_irqrestore(&smartcan_port_lock,flags);
 }
 
 unsigned smartcan_read_register(unsigned long address)
 {
 	unsigned ret;
-	can_disable_irq(smartcan_irq);
+	can_spin_irqflags_t flags;
+	can_spin_lock_irqsave(&smartcan_port_lock,flags);
 	outb(address-smartcan_base,smartcan_base);
 	ret=inb(smartcan_base+1);
-	can_enable_irq(smartcan_irq);
+	can_spin_unlock_irqrestore(&smartcan_port_lock,flags);
 	return ret;
 }