mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-20 04:44:26 +08:00
media: cx23885-alsa: number of pages should be unsigned long
As reported by smatch: drivers/media//pci/cx23885/cx23885-alsa.c:83 cx23885_alsa_dma_init() warn: should 'nr_pages << 12' be a 64 bit type? the number of patches should be unsigned long. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
99c2ec04e7
commit
7463773187
@ -68,7 +68,8 @@ MODULE_PARM_DESC(audio_debug, "enable debug messages [analog audio]");
|
||||
#define AUD_INT_MCHG_IRQ (1 << 21)
|
||||
#define GP_COUNT_CONTROL_RESET 0x3
|
||||
|
||||
static int cx23885_alsa_dma_init(struct cx23885_audio_dev *chip, int nr_pages)
|
||||
static int cx23885_alsa_dma_init(struct cx23885_audio_dev *chip,
|
||||
unsigned long nr_pages)
|
||||
{
|
||||
struct cx23885_audio_buffer *buf = chip->buf;
|
||||
struct page *pg;
|
||||
@ -76,11 +77,11 @@ static int cx23885_alsa_dma_init(struct cx23885_audio_dev *chip, int nr_pages)
|
||||
|
||||
buf->vaddr = vmalloc_32(nr_pages << PAGE_SHIFT);
|
||||
if (NULL == buf->vaddr) {
|
||||
dprintk(1, "vmalloc_32(%d pages) failed\n", nr_pages);
|
||||
dprintk(1, "vmalloc_32(%lu pages) failed\n", nr_pages);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
dprintk(1, "vmalloc is at addr %p, size=%d\n",
|
||||
dprintk(1, "vmalloc is at addr %p, size=%lu\n",
|
||||
buf->vaddr, nr_pages << PAGE_SHIFT);
|
||||
|
||||
memset(buf->vaddr, 0, nr_pages << PAGE_SHIFT);
|
||||
|
@ -325,8 +325,8 @@ struct cx23885_audio_buffer {
|
||||
struct cx23885_riscmem risc;
|
||||
void *vaddr;
|
||||
struct scatterlist *sglist;
|
||||
int sglen;
|
||||
int nr_pages;
|
||||
int sglen;
|
||||
unsigned long nr_pages;
|
||||
};
|
||||
|
||||
struct cx23885_audio_dev {
|
||||
|
Loading…
Reference in New Issue
Block a user