diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-27 16:17:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-03 11:25:17 +0100 |
| commit | f4de8fe6cffb449a779dff61f071bd1af9e18e0f (patch) | |
| tree | 3afbb7a3c79e6b995a67d03e33e70c3a622dc008 /sound/pci/hda/hda_intel.c | |
| parent | 6efdd8513f182492c21fb7238592d4539d5c751a (diff) | |
| download | blackbird-obmc-linux-f4de8fe6cffb449a779dff61f071bd1af9e18e0f.tar.gz blackbird-obmc-linux-f4de8fe6cffb449a779dff61f071bd1af9e18e0f.zip | |
ALSA: hda - Remove superfluous memory allocation error messages
The memory allocators should have already given the kernel warning
messages, thus we don't have to annoy again.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e75e8137e296..f7fb1b51d446 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1383,7 +1383,6 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, hda = kzalloc(sizeof(*hda), GFP_KERNEL); if (!hda) { - dev_err(card->dev, "Cannot allocate hda\n"); pci_disable_device(pci); return -ENOMEM; } @@ -1564,10 +1563,8 @@ static int azx_first_init(struct azx *chip) chip->num_streams = chip->playback_streams + chip->capture_streams; chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), GFP_KERNEL); - if (!chip->azx_dev) { - dev_err(card->dev, "cannot malloc azx_dev\n"); + if (!chip->azx_dev) return -ENOMEM; - } err = azx_alloc_stream_pages(chip); if (err < 0) |
