diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
| commit | cebeb0f1885fa93c44be5d4e0b9b640210ff088c (patch) | |
| tree | a33e4af4ddaa7a57f997ab9a2baceb48209670cd /sound/core/memalloc.c | |
| parent | 939ecf6b14c46e3448411a934418311b492bfee4 (diff) | |
| parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'sound/core/memalloc.c')
| -rw-r--r-- | sound/core/memalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 4595f93d151e0..082509eb805d5 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -207,7 +207,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, break; #endif default: - printk(KERN_ERR "snd-malloc: invalid device type %d\n", type); + pr_err("snd-malloc: invalid device type %d\n", type); dmab->area = NULL; dmab->addr = 0; return -ENXIO; @@ -284,7 +284,7 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) break; #endif default: - printk(KERN_ERR "snd-malloc: invalid device type %d\n", dmab->dev.type); + pr_err("snd-malloc: invalid device type %d\n", dmab->dev.type); } } |