Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d253258c authored by Jayachandran C's avatar Jayachandran C Committed by Dave Airlie
Browse files

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



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

Signed-off-by: default avatarJayachandran C. <c.jayachandran@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 031de96a

drivers/char/drm/via_irq.c

+4 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, 
{

	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, unsigned int irq, int force_sequence, 
	}



	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_device_t * dev) 
{

	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;