diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 13:33:24 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 13:33:24 +0300 |
| commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
| tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /sound/pci/echoaudio/darla20_dsp.c | |
| parent | 66139a48cee1530c91f37c145384b4ee7043f0b7 (diff) | |
| parent | 048184540171672a724ab8f8bada7fcc0762f5c6 (diff) | |
| download | linux-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/echoaudio/darla20_dsp.c')
| -rw-r--r-- | sound/pci/echoaudio/darla20_dsp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/darla20_dsp.c b/sound/pci/echoaudio/darla20_dsp.c index 20c7cbc89bb3..febee5bda877 100644 --- a/sound/pci/echoaudio/darla20_dsp.c +++ b/sound/pci/echoaudio/darla20_dsp.c @@ -33,12 +33,12 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) { int err; - DE_INIT(("init_hw() - Darla20\n")); if (snd_BUG_ON((subdevice_id & 0xfff0) != DARLA20)) return -ENODEV; if ((err = init_dsp_comm_page(chip))) { - DE_INIT(("init_hw - could not initialize DSP comm page\n")); + dev_err(chip->card->dev, + "init_hw: could not initialize DSP comm page\n"); return err; } @@ -57,7 +57,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) return err; chip->bad_board = FALSE; - DE_INIT(("init_hw done\n")); return err; } |