diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-06 21:33:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-06 21:33:19 -0500 |
| commit | c63d352f053a788281eb90df0a71cd3a6b2c4040 (patch) | |
| tree | ce0c6f0993100d3d8feda1d9d487dfba4abc5bd0 /sound | |
| parent | 862b3d2090ae3d8b10bb4ee9275fd932bc4d0d44 (diff) | |
| parent | bc3913a5378cd0ddefd1dfec6917cc12eb23a946 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'sound')
| -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); |