summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-03-05 12:13:10 +0100
committerTakashi Iwai <tiwai@suse.de>2014-03-05 12:15:56 +0100
commit4913cd6964d9548d8636ac87e05b7db6c486add5 (patch)
treed4aecf950338eacd756757cfca504488f3e86001 /sound/pci
parent4f50b41fa3deb541364462f3014e0b9d09b91f75 (diff)
downloadop-kernel-dev-4913cd6964d9548d8636ac87e05b7db6c486add5.zip
op-kernel-dev-4913cd6964d9548d8636ac87e05b7db6c486add5.tar.gz
ALSA: emu10k1: Fix possible NULL dereference
The previous dev_err() conversion resulted in a code that may give NULL dereference in snd_emu10k1_ptr_write(). Since it's a sanity check, better to be replaced with a debug macro like other places in this driver. Fixes: 6f002b02166c ('ALSA: emu10k1: Use standard printk helpers') Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/emu10k1/io.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 81c75b4..706b4f0 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -71,11 +71,8 @@ void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned i
unsigned long flags;
unsigned int mask;
- if (!emu) {
- dev_err(emu->card->dev, "ptr_write: emu is null!\n");
- dump_stack();
+ if (snd_BUG_ON(!emu))
return;
- }
mask = emu->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK;
regptr = ((reg << 16) & mask) | (chn & PTR_CHANNELNUM_MASK);
OpenPOWER on IntegriCloud