various: fix pci_set_dma_mask return value checking
Subsystems (7)
Network drivers Media (V4L/DVB) SAA7134 VIDEO4LINUX driver CX88 VIDEO4LINUX driver +3 more subsystems
PATCH 1/1 various: fix pci_set_dma_mask return value checking
pci_set_dma_mask returns a negative errno value, not a bool like pci_dma_supported. This of course was just a giant test for attention :)
Reported-by Jongman Heo <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/media/pci/cx23885/cx23885-core.c | 4 ++-- drivers/media/pci/cx25821/cx25821-core.c | 3 ++- drivers/media/pci/cx88/cx88-alsa.c | 4 ++-- drivers/media/pci/cx88/cx88-mpeg.c | 3 ++- drivers/media/pci/cx88/cx88-video.c | 4 ++-- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- drivers/media/pci/saa7134/saa7134-core.c | 4 ++-- drivers/media/pci/saa7164/saa7164-core.c | 4 ++-- drivers/media/pci/tw68/tw68-core.c | 4 ++-- drivers/net/ethernet/amd/pcnet32.c | 5 +++-- 10 files changed, 20 insertions(+), 17 deletions(-)
drivers/media/pci/cx23885/cx23885-core.c +2 -2
@@ -1992,9 +1992,9 @@ static int cx23885_initdev(struct pci_dev *pci_dev, (unsigned long long)pci_resource_start(pci_dev, 0));pci_set_master (pci_dev); -if (!pci_set_dma_mask (pci_dev,0xffffffff )) { + err =pci_set_dma_mask (pci_dev,0xffffffff ); +if (err) {printk ("%s/0: Oops: no 32bit PCI DMA ???\n" , dev->name); - err = -EIO ; goto fail_context; }
drivers/media/pci/cx25821/cx25821-core.c +2 -1
@@ -1319,7 +1319,8 @@ static int cx25821_initdev(struct pci_dev *pci_dev, dev->pci_lat, (unsigned long long)dev->base_io_addr);pci_set_master (pci_dev); -if (!pci_set_dma_mask (pci_dev,0xffffffff )) { + err =pci_set_dma_mask (pci_dev,0xffffffff ); +if (err) {pr_err ("%s/0: Oops: no 32bit PCI DMA ???\n" , dev->name); err = -EIO ; goto fail_irq;
drivers/media/pci/cx88/cx88-alsa.c +2 -2
@@ -890,9 +890,9 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,return err; } -if (!pci_set_dma_mask (pci,DMA_BIT_MASK (32 ))) { + err =pci_set_dma_mask (pci,DMA_BIT_MASK (32 )); +if (err) {dprintk (0 ,"%s/1: Oops: no 32bit PCI DMA ???\n" ,core->name); - err = -EIO ;cx88_core_put (core, pci);return err; }
drivers/media/pci/cx88/cx88-mpeg.c +2 -1
@@ -393,7 +393,8 @@ static int cx8802_init_common(struct cx8802_dev *dev)if (pci_enable_device (dev->pci))return -EIO ;pci_set_master (dev->pci); -if (!pci_set_dma_mask (dev->pci,DMA_BIT_MASK (32 ))) { + err =pci_set_dma_mask (dev->pci,DMA_BIT_MASK (32 )); +if (err) {printk ("%s/2: Oops: no 32bit PCI DMA ???\n" ,dev->core->name);return -EIO ; }
drivers/media/pci/cx88/cx88-video.c +2 -2
@@ -1314,9 +1314,9 @@ static int cx8800_initdev(struct pci_dev *pci_dev, dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));pci_set_master (pci_dev); -if (!pci_set_dma_mask (pci_dev,DMA_BIT_MASK (32 ))) { + err =pci_set_dma_mask (pci_dev,DMA_BIT_MASK (32 )); +if (err) {printk ("%s/0: Oops: no 32bit PCI DMA ???\n" ,core->name); - err = -EIO ; goto fail_core; } dev->alloc_ctx =vb2_dma_sg_init_ctx (&pci_dev->dev);
drivers/media/pci/netup_unidvb/netup_unidvb_core.c +1 -1
@@ -810,7 +810,7 @@ static int netup_unidvb_initdev(struct pci_dev *pci_dev,"%s(): board vendor 0x%x, revision 0x%x\n" , __func__, board_vendor, board_revision);pci_set_master (pci_dev); -if (!pci_set_dma_mask (pci_dev,0xffffffff )) { +if (pci_set_dma_mask (pci_dev,0xffffffff ) <0 ) {dev_err (&pci_dev->dev,"%s(): 32bit PCI DMA is not supported\n" , __func__); goto pci_detect_err;
drivers/media/pci/saa7134/saa7134-core.c +2 -2
@@ -951,9 +951,9 @@ static int saa7134_initdev(struct pci_dev *pci_dev,pci_name (pci_dev), dev->pci_rev, pci_dev->irq, dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));pci_set_master (pci_dev); -if (!pci_set_dma_mask (pci_dev,DMA_BIT_MASK (32 ))) { + err =pci_set_dma_mask (pci_dev,DMA_BIT_MASK (32 )); +if (err) {pr_warn ("%s: Oops: no 32bit PCI DMA ???\n" , dev->name); - err = -EIO ; goto fail1; }
drivers/media/pci/saa7164/saa7164-core.c +2 -2
@@ -1264,9 +1264,9 @@ static int saa7164_initdev(struct pci_dev *pci_dev,pci_set_master (pci_dev);/* TODO */ -if (!pci_set_dma_mask (pci_dev,0xffffffff )) { + err =pci_set_dma_mask (pci_dev,0xffffffff ); +if (err) {printk ("%s/0: Oops: no 32bit PCI DMA ???\n" , dev->name); - err = -EIO ; goto fail_irq; }
drivers/media/pci/tw68/tw68-core.c +2 -2
@@ -257,9 +257,9 @@ static int tw68_initdev(struct pci_dev *pci_dev, dev->name,pci_name (pci_dev), dev->pci_rev, pci_dev->irq, dev->pci_lat, (u64)pci_resource_start(pci_dev, 0));pci_set_master (pci_dev); -if (!pci_set_dma_mask (pci_dev,DMA_BIT_MASK (32 ))) { + err =pci_set_dma_mask (pci_dev,DMA_BIT_MASK (32 )); +if (err) {pr_info ("%s: Oops: no 32bit PCI DMA ???\n" , dev->name); - err = -EIO ; goto fail1; }
drivers/net/ethernet/amd/pcnet32.c +3 -2
@@ -1500,10 +1500,11 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)return -ENODEV ; } -if (!pci_set_dma_mask (pdev,PCNET32_DMA_MASK )) { + err =pci_set_dma_mask (pdev,PCNET32_DMA_MASK ); +if (err) {if (pcnet32_debug &NETIF_MSG_PROBE )pr_err ("architecture does not support 32bit PCI busmaster DMA\n" ); -return -ENODEV ; +return err; }if (!request_region (ioaddr,PCNET32_TOTAL_SIZE ,"pcnet32_probe_pci" )) {if (pcnet32_debug &NETIF_MSG_PROBE )
Signature · 1 line
1.9.1