summaryrefslogtreecommitdiff
path: root/sound/ppc/pmac.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2005-08-17 14:36:35 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-18 01:55:37 +0400
commit4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 (patch)
treeaca4c35e2d288bbdf5248be241c52f67f820bb59 /sound/ppc/pmac.c
parentac9af7cba9e642961bfdee1a1fac6060405597e5 (diff)
downloadlinux-4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678.tar.xz
[PATCH] Stop snd-powermac oopsing on non-pmac hardware.
We shouldn't be assuming that ppc_md.feature_call will be present. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r--sound/ppc/pmac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 844d76152ea2..c89e82eb06a6 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -765,7 +765,8 @@ snd_pmac_ctrl_intr(int irq, void *devid, struct pt_regs *regs)
*/
static void snd_pmac_sound_feature(pmac_t *chip, int enable)
{
- ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable);
+ if (ppc_md.feature_call)
+ ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable);
}
/*