diff options
Diffstat (limited to 'sound/pci/emu10k1/memory.c')
| -rw-r--r-- | sound/pci/emu10k1/memory.c | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index ae709c1ab3a..c68e6dd2fa6 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -236,11 +236,13 @@ __found_pages:  static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)  {  	if (addr & ~emu->dma_mask) { -		snd_printk(KERN_ERR "max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr); +		dev_err(emu->card->dev, +			"max memory size is 0x%lx (addr = 0x%lx)!!\n", +			emu->dma_mask, (unsigned long)addr);  		return 0;  	}  	if (addr & (EMUPAGESIZE-1)) { -		snd_printk(KERN_ERR "page is not aligned\n"); +		dev_err(emu->card->dev, "page is not aligned\n");  		return 0;  	}  	return 1; @@ -331,7 +333,8 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst  		else  			addr = snd_pcm_sgbuf_get_addr(substream, ofs);  		if (! is_valid_page(emu, addr)) { -			printk(KERN_ERR "emu: failure page = %d\n", idx); +			dev_err(emu->card->dev, +				"emu: failure page = %d\n", idx);  			mutex_unlock(&hdr->block_mutex);  			return NULL;  		} @@ -507,7 +510,8 @@ static inline void *offset_ptr(struct snd_emu10k1 *emu, int page, int offset)  		return NULL;  	ptr = emu->page_ptr_table[page];  	if (! ptr) { -		printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page); +		dev_err(emu->card->dev, +			"access to NULL ptr: page = %d\n", page);  		return NULL;  	}  	ptr += offset & (PAGE_SIZE - 1);  | 
