diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/pci/echoaudio/darla20_dsp.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'sound/pci/echoaudio/darla20_dsp.c')
| -rw-r--r-- | sound/pci/echoaudio/darla20_dsp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/darla20_dsp.c b/sound/pci/echoaudio/darla20_dsp.c index 4159e3bc186..29043301ebb 100644 --- a/sound/pci/echoaudio/darla20_dsp.c +++ b/sound/pci/echoaudio/darla20_dsp.c | |||
| @@ -34,7 +34,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
| 34 | int err; | 34 | int err; |
| 35 | 35 | ||
| 36 | DE_INIT(("init_hw() - Darla20\n")); | 36 | DE_INIT(("init_hw() - Darla20\n")); |
| 37 | snd_assert((subdevice_id & 0xfff0) == DARLA20, return -ENODEV); | 37 | if (snd_BUG_ON((subdevice_id & 0xfff0) != DARLA20)) |
| 38 | return -ENODEV; | ||
| 38 | 39 | ||
| 39 | if ((err = init_dsp_comm_page(chip))) { | 40 | if ((err = init_dsp_comm_page(chip))) { |
| 40 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); | 41 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); |