dbri: move dereference after check for NULL
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 1 Dec 2016 05:48:30 +0000 (08:48 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Dec 2016 17:18:22 +0000 (12:18 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
sound/sparc/dbri.c

index 3fe4468ea2c57531ec8e421f7a8e93d2d5f16b0e..52063b2626677144d8f47585147cc129011f93c7 100644 (file)
@@ -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);