aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/opl3/opl3_synth.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-15 11:31:54 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-15 11:31:54 +1100
commit6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch)
tree06a5a9a08519950575505273eabced331ed51405 /sound/drivers/opl3/opl3_synth.c
parentee673eaa72d8d185012b1027a05e25aba18c267f (diff)
parent8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff)
downloadkernel_samsung_espresso10-6dc6472581f693b5fc95aebedf67b4960fb85cf0.zip
kernel_samsung_espresso10-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.gz
kernel_samsung_espresso10-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.bz2
Merge commit 'origin'
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h
Diffstat (limited to 'sound/drivers/opl3/opl3_synth.c')
-rw-r--r--sound/drivers/opl3/opl3_synth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c
index fb64c89..962bb9c 100644
--- a/sound/drivers/opl3/opl3_synth.c
+++ b/sound/drivers/opl3/opl3_synth.c
@@ -92,7 +92,8 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file,
struct snd_opl3 *opl3 = hw->private_data;
void __user *argp = (void __user *)arg;
- snd_assert(opl3 != NULL, return -EINVAL);
+ if (snd_BUG_ON(!opl3))
+ return -EINVAL;
switch (cmd) {
/* get information */