- drm-fix-further-issues-in-drivers-char-drm-via_irqc.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     drm: Fix further issues in drivers/char/drm/via_irq.c

has been removed from the -mm tree.  Its filename is

     drm-fix-further-issues-in-drivers-char-drm-via_irqc.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.


From: Jayachandran C. <c.jayachandran@xxxxxxxxx>

Fix de-reference of 'dev_priv' before NULL check.

Signed-off-by: Jayachandran C. <c.jayachandran@xxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/char/drm/via_irq.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -puN drivers/char/drm/via_irq.c~drm-fix-further-issues-in-drivers-char-drm-via_irqc drivers/char/drm/via_irq.c
--- devel/drivers/char/drm/via_irq.c~drm-fix-further-issues-in-drivers-char-drm-via_irqc	2006-04-10 15:07:40.000000000 -0700
+++ devel-akpm/drivers/char/drm/via_irq.c	2006-04-10 15:07:40.000000000 -0700
@@ -196,7 +196,7 @@ via_driver_irq_wait(drm_device_t * dev, 
 {
 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 	unsigned int cur_irq_sequence;
-	drm_via_irq_t *cur_irq = dev_priv->via_irqs;
+	drm_via_irq_t *cur_irq;
 	int ret = 0;
 	maskarray_t *masks;
 	int real_irq;
@@ -223,7 +223,7 @@ via_driver_irq_wait(drm_device_t * dev, 
 	}
 
 	masks = dev_priv->irq_masks;
-	cur_irq += real_irq;
+	cur_irq = dev_priv->via_irqs + real_irq;
 
 	if (masks[real_irq][2] && !force_sequence) {
 		DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
@@ -248,11 +248,12 @@ void via_driver_irq_preinstall(drm_devic
 {
 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 	u32 status;
-	drm_via_irq_t *cur_irq = dev_priv->via_irqs;
+	drm_via_irq_t *cur_irq;
 	int i;
 
 	DRM_DEBUG("driver_irq_preinstall: dev_priv: %p\n", dev_priv);
 	if (dev_priv) {
+		cur_irq = dev_priv->via_irqs;
 
 		dev_priv->irq_enable_mask = VIA_IRQ_VBLANK_ENABLE;
 		dev_priv->irq_pending_mask = VIA_IRQ_VBLANK_PENDING;
_

Patches currently in -mm which might be from c.jayachandran@xxxxxxxxx are


-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux