diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-06 18:24:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-06 18:24:11 +0100 |
| commit | bc3913a5378cd0ddefd1dfec6917cc12eb23a946 (patch) | |
| tree | ce39755a838f5213368793b60fee0a3703d39543 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | dbri: move dereference after check for NULL (diff) | |
| download | linux-bc3913a5378cd0ddefd1dfec6917cc12eb23a946.tar.xz linux-bc3913a5378cd0ddefd1dfec6917cc12eb23a946.zip | |
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
| -rw-r--r-- | sound/sparc/dbri.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 3fe4468ea2c5..52063b262667 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); |