Skip to content

Commit bc3913a

Browse files
committed
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
2 parents da1b466 + 163117e commit bc3913a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

sound/sparc/dbri.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1702,14 +1702,15 @@ interrupts are disabled.
17021702
static void xmit_descs(struct snd_dbri *dbri)
17031703
{
17041704
struct dbri_streaminfo *info;
1705-
u32 dvma_addr = (u32)dbri->dma_dvma;
1705+
u32 dvma_addr;
17061706
s32 *cmd;
17071707
unsigned long flags;
17081708
int first_td;
17091709

17101710
if (dbri == NULL)
17111711
return; /* Disabled */
17121712

1713+
dvma_addr = (u32)dbri->dma_dvma;
17131714
info = &dbri->stream_info[DBRI_REC];
17141715
spin_lock_irqsave(&dbri->lock, flags);
17151716

0 commit comments

Comments
 (0)