diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-04-20 10:16:52 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-04-20 10:16:52 +0000 |
| commit | 2b8dc25dc549533f1567093fb7dffc06d6f55268 (patch) | |
| tree | d873ba97d5c7942ae8be74f6b05547670664bec7 | |
| parent | b0c461c8e374d7e92e5013a03fc6096595a74700 (diff) | |
VIA: Interrupt handler bugfixes. Bumped patchlevel to 2.6.2.
| -rw-r--r-- | shared-core/via_drv.h | 4 | ||||
| -rw-r--r-- | shared-core/via_irq.c | 7 | ||||
| -rw-r--r-- | shared/via.h | 4 | ||||
| -rw-r--r-- | shared/via_irq.c | 7 |
4 files changed, 4 insertions, 18 deletions
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h index 49a382fe..a6164197 100644 --- a/shared-core/via_drv.h +++ b/shared-core/via_drv.h @@ -28,11 +28,11 @@ #define DRIVER_NAME "via" #define DRIVER_DESC "VIA Unichrome / Pro" -#define DRIVER_DATE "20050418" +#define DRIVER_DATE "20050420" #define DRIVER_MAJOR 2 #define DRIVER_MINOR 6 -#define DRIVER_PATCHLEVEL 1 +#define DRIVER_PATCHLEVEL 2 #include "via_verifier.h" diff --git a/shared-core/via_irq.c b/shared-core/via_irq.c index c0a30c63..e8027f3a 100644 --- a/shared-core/via_irq.c +++ b/shared-core/via_irq.c @@ -110,13 +110,6 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) atomic_inc( &cur_irq->irq_received ); DRM_WAKEUP( &cur_irq->irq_queue ); handled = 1; - VIA_WRITE(VIA_REG_INTERRUPT, status); - - if (handled) - return IRQ_HANDLED; - else - return IRQ_NONE; - } cur_irq++; } diff --git a/shared/via.h b/shared/via.h index fcfefae7..985358b0 100644 --- a/shared/via.h +++ b/shared/via.h @@ -30,11 +30,11 @@ #define DRIVER_NAME "via" #define DRIVER_DESC "VIA Unichrome / Pro" -#define DRIVER_DATE "20050418" +#define DRIVER_DATE "20050420" #define DRIVER_MAJOR 2 #define DRIVER_MINOR 6 -#define DRIVER_PATCHLEVEL 1 +#define DRIVER_PATCHLEVEL 2 #define DRIVER_IOCTLS \ [DRM_IOCTL_NR(DRM_IOCTL_VIA_ALLOCMEM)] = { via_mem_alloc, 1, 0 }, \ diff --git a/shared/via_irq.c b/shared/via_irq.c index f61081c2..0812e926 100644 --- a/shared/via_irq.c +++ b/shared/via_irq.c @@ -111,13 +111,6 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) atomic_inc( &cur_irq->irq_received ); DRM_WAKEUP( &cur_irq->irq_queue ); handled = 1; - VIA_WRITE(VIA_REG_INTERRUPT, status); - - if (handled) - return IRQ_HANDLED; - else - return IRQ_NONE; - } cur_irq++; } |