VIA: Interrupt handler bugfixes. Bumped patchlevel to 2.6.2.

diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h
index 49a382f..a616419 100644 (file)
--- 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 c0a30c6..e8027f3 100644 (file)
--- 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 fcfefae..985358b 100644 (file)
--- 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 f61081c..0812e92 100644 (file)
--- 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++;
        }