diff mbox

dbri: move dereference after check for NULL

Message ID 20161201054830.GA20077@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Dec. 1, 2016, 5:48 a.m. UTC 
We accidentally introduced a dereference before the NULL check in
xmit_descs() as part of silencing a GCC warning.

Fixes: 16f46050e709 ("dbri: Fix compiler warning")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Goes into the sparc tree.

Comments

David Miller Dec. 6, 2016, 5:19 p.m. UTC | #1 
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 1 Dec 2016 08:48:30 +0300

> We accidentally introduced a dereference before the NULL check in
> xmit_descs() as part of silencing a GCC warning.
> 
> Fixes: 16f46050e709 ("dbri: Fix compiler warning")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks Dan.
diff mbox

Patch

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 3fe4468..52063b2 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -1702,7 +1702,7 @@  interrupts are disabled.
 static void xmit_descs(struct snd_dbri *dbri)
 {
 	struct dbri_streaminfo *info;
-	u32 dvma_addr = (u32)dbri->dma_dvma;
+	u32 dvma_addr;
 	s32 *cmd;
 	unsigned long flags;
 	int first_td;
@@ -1710,6 +1710,7 @@  static void xmit_descs(struct snd_dbri *dbri)
 	if (dbri == NULL)
 		return;		/* Disabled */
 
+	dvma_addr = (u32)dbri->dma_dvma;
 	info = &dbri->stream_info[DBRI_REC];
 	spin_lock_irqsave(&dbri->lock, flags);