diff options
Diffstat (limited to 'drivers/staging/kpc2000/kpc2000/core.c')
| -rw-r--r-- | drivers/staging/kpc2000/kpc2000/core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/kpc2000/kpc2000/core.c b/drivers/staging/kpc2000/kpc2000/core.c index 40390cdd3c8d..adf5dfa0c552 100644 --- a/drivers/staging/kpc2000/kpc2000/core.c +++ b/drivers/staging/kpc2000/kpc2000/core.c @@ -60,7 +60,7 @@ static ssize_t show_cpld_config_reg(struct device *dev, struct device_attribute static ssize_t cpld_reconfigure(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct pci_dev *pdev = to_pci_dev(dev); - long wr_val; + unsigned long wr_val; struct kp2000_device *pcard; int rv; @@ -68,7 +68,7 @@ static ssize_t cpld_reconfigure(struct device *dev, struct device_attribute *att pcard = pci_get_drvdata(pdev); if (!pcard) return -ENXIO; - rv = kstrtol(buf, 0, &wr_val); + rv = kstrtoul(buf, 0, &wr_val); if (rv < 0) return rv; if (wr_val > 7) return -EINVAL; @@ -203,7 +203,6 @@ int kp2000_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) int err = 0; struct kp2000_device *pcard; static int card_count = 1; - int rv; unsigned long reg_bar_phys_addr; unsigned long reg_bar_phys_len; unsigned long dma_bar_phys_addr; @@ -336,9 +335,9 @@ int kp2000_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (err < 0) goto out8a; - rv = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED, pcard->name, pcard); - if (rv){ - dev_err(&pcard->pdev->dev, "kp2000_pcie_probe: failed to request_irq: %d\n", rv); + err = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED, pcard->name, pcard); + if (err){ + dev_err(&pcard->pdev->dev, "kp2000_pcie_probe: failed to request_irq: %d\n", err); goto out8b; } //} |