luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mISDN: Fix return values of the probe function

Browse Source 
[ Upstream commit e211210098cb7490db2183d725f5c0f10463a704 ]

During the process of driver probing, the probe function should return < 0
for failure, otherwise, the kernel will treat value > 0 as success.

Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zheyu Ma 2021-10-18 14:20:38 +00:00 committed by Greg Kroah-Hartman
parent a6cb5e09e1
commit ad01685177
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/isdn/hardware/mISDN/hfcpci.c
View File

@ -1994,14 +1994,14 @@ setup_hw(struct hfc_pci *hc)
pci_set_master(hc->pdev); pci_set_master(hc->pdev);
if (!hc->irq) { if (!hc->irq) {
printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");
return 1; return -EINVAL;
} }
hc->hw.pci_io = hc->hw.pci_io =
(char __iomem *)(unsigned long)hc->pdev->resource[1].start; (char __iomem *)(unsigned long)hc->pdev->resource[1].start;
if (!hc->hw.pci_io) { if (!hc->hw.pci_io) {
printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");
return 1; return -ENOMEM;
} }
/* Allocate memory for FIFOS */ /* Allocate memory for FIFOS */
/* the memory needs to be on a 32k boundary within the first 4G */ /* the memory needs to be on a 32k boundary within the first 4G */
@ -2012,7 +2012,7 @@ setup_hw(struct hfc_pci *hc)
if (!buffer) { if (!buffer) {
printk(KERN_WARNING printk(KERN_WARNING
"HFC-PCI: Error allocating memory for FIFO!\n"); "HFC-PCI: Error allocating memory for FIFO!\n");
return 1; return -ENOMEM;
} }
hc->hw.fifos = buffer; hc->hw.fifos = buffer;
pci_write_config_dword(hc->pdev, 0x80, hc->hw.dmahandle); pci_write_config_dword(hc->pdev, 0x80, hc->hw.dmahandle);
@ -2022,7 +2022,7 @@ setup_hw(struct hfc_pci *hc)
"HFC-PCI: Error in ioremap for PCI!\n"); "HFC-PCI: Error in ioremap for PCI!\n");
dma_free_coherent(&hc->pdev->dev, 0x8000, hc->hw.fifos, dma_free_coherent(&hc->pdev->dev, 0x8000, hc->hw.fifos,
hc->hw.dmahandle); hc->hw.dmahandle);
return 1; return -ENOMEM;
} }
printk(KERN_INFO printk(KERN_INFO