aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r--drivers/net/wireless/p54/p54pci.c1
-rw-r--r--drivers/net/wireless/p54/p54spi.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 57e3af8ebb4b..f9a07b0d83ac 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -631,7 +631,6 @@ static int p54p_probe(struct pci_dev *pdev,
631 iounmap(priv->map); 631 iounmap(priv->map);
632 632
633 err_free_dev: 633 err_free_dev:
634 pci_set_drvdata(pdev, NULL);
635 p54_free_common(dev); 634 p54_free_common(dev);
636 635
637 err_free_reg: 636 err_free_reg:
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 7fc46f26cf2b..de15171e2cd8 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -636,7 +636,7 @@ static int p54spi_probe(struct spi_device *spi)
636 gpio_direction_input(p54spi_gpio_irq); 636 gpio_direction_input(p54spi_gpio_irq);
637 637
638 ret = request_irq(gpio_to_irq(p54spi_gpio_irq), 638 ret = request_irq(gpio_to_irq(p54spi_gpio_irq),
639 p54spi_interrupt, IRQF_DISABLED, "p54spi", 639 p54spi_interrupt, 0, "p54spi",
640 priv->spi); 640 priv->spi);
641 if (ret < 0) { 641 if (ret < 0) {
642 dev_err(&priv->spi->dev, "request_irq() failed"); 642 dev_err(&priv->spi->dev, "request_irq() failed");