mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

media: saa7134-alsa.c: number of pages should be unsigned long

Browse source 
As reported by smatch:

	drivers/media/pci/saa7134/saa7134-alsa.c:267 saa7134_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:
Mauro Carvalho Chehab 2020-09-01 17:08:31 +02:00
parent b4e0a5f9c0
commit c91effc082
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/pci/saa7134/saa7134-alsa.c
View file

@ -252,7 +252,8 @@ static int snd_card_saa7134_capture_trigger(struct snd_pcm_substream * substream
return err;
}
static int saa7134_alsa_dma_init(struct saa7134_dev *dev, int nr_pages)
static int saa7134_alsa_dma_init(struct saa7134_dev *dev,
unsigned long nr_pages)
{
struct saa7134_dmasound *dma = &dev->dmasound;
struct page *pg;
@ -260,11 +261,11 @@ static int saa7134_alsa_dma_init(struct saa7134_dev *dev, int nr_pages)
dma->vaddr = vmalloc_32(nr_pages << PAGE_SHIFT);
if (NULL == dma->vaddr) {
pr_debug("vmalloc_32(%d pages) failed\n", nr_pages);
pr_debug("vmalloc_32(%lu pages) failed\n", nr_pages);
return -ENOMEM;
}
pr_debug("vmalloc is at addr %p, size=%d\n",
pr_debug("vmalloc is at addr %p, size=%lu\n",
dma->vaddr, nr_pages << PAGE_SHIFT);
memset(dma->vaddr, 0, nr_pages << PAGE_SHIFT);

2
drivers/media/pci/saa7134/saa7134.h
View file

@ -509,7 +509,7 @@ struct saa7134_dmasound {
void *vaddr;
struct scatterlist *sglist;
int sglen;
int nr_pages;
unsigned long nr_pages;
unsigned int dma_blk;
unsigned int read_offset;
unsigned int read_count;