Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fix from David Miller:
 "A use-before-NULL-check from Dan Carpenter"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  dbri: move dereference after check for NULL

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 3fe4468ea2c57531ec8e421f7a8e93d2d5f16b0e..52063b2626677144d8f47585147cc129011f93c7 100644 (file)
--- 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);