include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / atm / solos-pci.c

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 6c82834..ded76c4 100644 (file)
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -40,6 +40,7 @@
 #include <linux/firmware.h>
 #include <linux/ctype.h>
 #include <linux/swab.h>
+#include <linux/slab.h>
 
 #define VERSION "0.07"
 #define PTAG "solos-pci"
@@ -142,6 +143,9 @@ MODULE_AUTHOR("Traverse Technologies <support@traverse.com.au>");
 MODULE_DESCRIPTION("Solos PCI driver");
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("solos-FPGA.bin");
+MODULE_FIRMWARE("solos-Firmware.bin");
+MODULE_FIRMWARE("solos-db-FPGA.bin");
 MODULE_PARM_DESC(reset, "Reset Solos chips on startup");
 MODULE_PARM_DESC(atmdebug, "Print ATM data");
 MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
@@ -386,7 +390,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
        }
 
        snr = next_string(skb);
-       if (!str)
+       if (!snr)
                return -EIO;
        attn = next_string(skb);
        if (!attn)
@@ -528,34 +532,37 @@ static int flash_upgrade(struct solos_card *card, int chip)
        int numblocks = 0;
        int offset;
 
-       if (chip == 0) {
+       switch (chip) {
+       case 0:
                fw_name = "solos-FPGA.bin";
                blocksize = FPGA_BLOCK;
-       } 
-       
-       if (chip == 1) {
+               break;
+       case 1:
                fw_name = "solos-Firmware.bin";
                blocksize = SOLOS_BLOCK;
-       }
-       
-       if (chip == 2){
+               break;
+       case 2:
                if (card->fpga_version > LEGACY_BUFFERS){
                        fw_name = "solos-db-FPGA.bin";
                        blocksize = FPGA_BLOCK;
                } else {
-                       dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
+                       dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                       " daughter board upgrades\n");
                        return -EPERM;
                }
-       }
-       
-       if (chip == 3){
+               break;
+       case 3:
                if (card->fpga_version > LEGACY_BUFFERS){
                        fw_name = "solos-Firmware.bin";
                        blocksize = SOLOS_BLOCK;
                } else {
-               dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
-               return -EPERM;
+                       dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                       " daughter board upgrades\n");
+                       return -EPERM;
                }
+               break;
+       default:
+               return -ENODEV;
        }
 
        if (request_firmware(&fw, fw_name, &card->dev->dev))
@@ -1104,7 +1111,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
                goto out;
        }
 
-       err = pci_set_dma_mask(dev, DMA_32BIT_MASK);
+       err = pci_set_dma_mask(dev, DMA_BIT_MASK(32));
        if (err) {
                dev_warn(&dev->dev, "Failed to set 32-bit DMA mask\n");
                goto out;
@@ -1207,6 +1214,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
  out_release_regions:
        pci_release_regions(dev);
  out:
+       kfree(card);
        return err;
 }