linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / wireless / hostap / hostap_pci.c

diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index c2fa011..2e85bdc 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -4,6 +4,7 @@
  * driver patches from Reyk Floeter <reyk@vantronix.net> and
  * Andy Warner <andyw@pobox.com> */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -306,7 +307,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
        memset(hw_priv, 0, sizeof(*hw_priv));
 
        if (pci_enable_device(pdev))
-               goto err_out_free;
+               return -EIO;
 
        phymem = pci_resource_start(pdev, 0);
 
@@ -337,7 +338,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
 
        pci_set_drvdata(pdev, dev);
 
-       if (request_irq(dev->irq, prism2_interrupt, IRQF_SHARED, dev->name,
+       if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
                        dev)) {
                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
                goto fail;
@@ -367,8 +368,6 @@ static int prism2_pci_probe(struct pci_dev *pdev,
  err_out_disable:
        pci_disable_device(pdev);
        prism2_free_local_data(dev);
-
- err_out_free:
        kfree(hw_priv);
 
        return -ENODEV;