7 files changed, 66 insertions, 26 deletions

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 98099f526d82..b119640e1ee9 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1690,17 +1690,17 @@ static int __devinit fs_init (struct fs_dev *dev)
                   | (0 * SARMODE0_SHADEN) /* We don't use shadow registers. */
                   | (1 * SARMODE0_INTMODE_READCLEAR)
                   | (1 * SARMODE0_CWRE)
-                  | IS_FS50(dev)?SARMODE0_PRPWT_FS50_5: 
-                                 SARMODE0_PRPWT_FS155_3
+                  | (IS_FS50(dev) ? SARMODE0_PRPWT_FS50_5:
+                          SARMODE0_PRPWT_FS155_3)
                   | (1 * SARMODE0_CALSUP_1)
-                  | IS_FS50 (dev)?(0
+                  | (IS_FS50(dev) ? (0
                                    | SARMODE0_RXVCS_32
                                    | SARMODE0_ABRVCS_32 
                                    | SARMODE0_TXVCS_32):
                                   (0
                                    | SARMODE0_RXVCS_1k
                                    | SARMODE0_ABRVCS_1k 
-                                   | SARMODE0_TXVCS_1k));
+                                   | SARMODE0_TXVCS_1k)));
 
         /* 10ms * 100 is 1 second. That should be enough, as AN3:9 says it takes
            1ms. */
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 937c9c0ef4c9..10f000dbe448 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2519,8 +2519,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
         return err;
 
     sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT);
-    if (request_firmware(&firmware, buf, device) == 1) {
-        printk(FORE200E "missing %s firmware image\n", fore200e->bus->model_name);
+    if ((err = request_firmware(&firmware, buf, device)) < 0) {
+        printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name);
         return err;
     }
 
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index bdbad7edf682..29e66d603d3c 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -358,7 +358,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
 
         if (pci_enable_device(pci_dev))
                 return -EIO;
-        if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK) != 0) {
+        if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32)) != 0) {
                 printk(KERN_WARNING "he: no suitable dma available\n");
                 err = -EIO;
                 goto init_one_failure;
@@ -790,11 +790,15 @@ he_init_group(struct he_dev *he_dev, int group)
         he_dev->rbps_base = pci_alloc_consistent(he_dev->pci_dev,
                 CONFIG_RBPS_SIZE * sizeof(struct he_rbp), &he_dev->rbps_phys);
         if (he_dev->rbps_base == NULL) {
-                hprintk("failed to alloc rbps\n");
-                return -ENOMEM;
+                hprintk("failed to alloc rbps_base\n");
+                goto out_destroy_rbps_pool;
         }
         memset(he_dev->rbps_base, 0, CONFIG_RBPS_SIZE * sizeof(struct he_rbp));
         he_dev->rbps_virt = kmalloc(CONFIG_RBPS_SIZE * sizeof(struct he_virt), GFP_KERNEL);
+        if (he_dev->rbps_virt == NULL) {
+                hprintk("failed to alloc rbps_virt\n");
+                goto out_free_rbps_base;
+        }
 
         for (i = 0; i < CONFIG_RBPS_SIZE; ++i) {
                 dma_addr_t dma_handle;
@@ -802,7 +806,7 @@ he_init_group(struct he_dev *he_dev, int group)
 
                 cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|GFP_DMA, &dma_handle);
                 if (cpuaddr == NULL)
-                        return -ENOMEM;
+                        goto out_free_rbps_virt;
 
                 he_dev->rbps_virt[i].virt = cpuaddr;
                 he_dev->rbps_base[i].status = RBP_LOANED | RBP_SMALLBUF | (i << RBP_INDEX_OFF);
@@ -827,17 +831,21 @@ he_init_group(struct he_dev *he_dev, int group)
                         CONFIG_RBPL_BUFSIZE, 8, 0);
         if (he_dev->rbpl_pool == NULL) {
                 hprintk("unable to create rbpl pool\n");
-                return -ENOMEM;
+                goto out_free_rbps_virt;
         }
 
         he_dev->rbpl_base = pci_alloc_consistent(he_dev->pci_dev,
                 CONFIG_RBPL_SIZE * sizeof(struct he_rbp), &he_dev->rbpl_phys);
         if (he_dev->rbpl_base == NULL) {
-                hprintk("failed to alloc rbpl\n");
-                return -ENOMEM;
+                hprintk("failed to alloc rbpl_base\n");
+                goto out_destroy_rbpl_pool;
         }
         memset(he_dev->rbpl_base, 0, CONFIG_RBPL_SIZE * sizeof(struct he_rbp));
         he_dev->rbpl_virt = kmalloc(CONFIG_RBPL_SIZE * sizeof(struct he_virt), GFP_KERNEL);
+        if (he_dev->rbpl_virt == NULL) {
+                hprintk("failed to alloc rbpl_virt\n");
+                goto out_free_rbpl_base;
+        }
 
         for (i = 0; i < CONFIG_RBPL_SIZE; ++i) {
                 dma_addr_t dma_handle;
@@ -845,7 +853,7 @@ he_init_group(struct he_dev *he_dev, int group)
 
                 cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|GFP_DMA, &dma_handle);
                 if (cpuaddr == NULL)
-                        return -ENOMEM;
+                        goto out_free_rbpl_virt;
 
                 he_dev->rbpl_virt[i].virt = cpuaddr;
                 he_dev->rbpl_base[i].status = RBP_LOANED | (i << RBP_INDEX_OFF);
@@ -870,7 +878,7 @@ he_init_group(struct he_dev *he_dev, int group)
                 CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq), &he_dev->rbrq_phys);
         if (he_dev->rbrq_base == NULL) {
                 hprintk("failed to allocate rbrq\n");
-                return -ENOMEM;
+                goto out_free_rbpl_virt;
         }
         memset(he_dev->rbrq_base, 0, CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq));
 
@@ -894,7 +902,7 @@ he_init_group(struct he_dev *he_dev, int group)
                 CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq), &he_dev->tbrq_phys);
         if (he_dev->tbrq_base == NULL) {
                 hprintk("failed to allocate tbrq\n");
-                return -ENOMEM;
+                goto out_free_rbpq_base;
         }
         memset(he_dev->tbrq_base, 0, CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq));
 
@@ -906,6 +914,39 @@ he_init_group(struct he_dev *he_dev, int group)
         he_writel(he_dev, CONFIG_TBRQ_THRESH, G0_TBRQ_THRESH + (group * 16));
 
         return 0;
+
+out_free_rbpq_base:
+        pci_free_consistent(he_dev->pci_dev, CONFIG_RBRQ_SIZE *
+                        sizeof(struct he_rbrq), he_dev->rbrq_base,
+                        he_dev->rbrq_phys);
+        i = CONFIG_RBPL_SIZE;
+out_free_rbpl_virt:
+        while (--i)
+                pci_pool_free(he_dev->rbps_pool, he_dev->rbpl_virt[i].virt,
+                                he_dev->rbps_base[i].phys);
+        kfree(he_dev->rbpl_virt);
+
+out_free_rbpl_base:
+        pci_free_consistent(he_dev->pci_dev, CONFIG_RBPL_SIZE *
+                        sizeof(struct he_rbp), he_dev->rbpl_base,
+                        he_dev->rbpl_phys);
+out_destroy_rbpl_pool:
+        pci_pool_destroy(he_dev->rbpl_pool);
+
+        i = CONFIG_RBPL_SIZE;
+out_free_rbps_virt:
+        while (--i)
+                pci_pool_free(he_dev->rbpl_pool, he_dev->rbps_virt[i].virt,
+                                he_dev->rbpl_base[i].phys);
+        kfree(he_dev->rbps_virt);
+
+out_free_rbps_base:
+        pci_free_consistent(he_dev->pci_dev, CONFIG_RBPS_SIZE *
+                        sizeof(struct he_rbp), he_dev->rbps_base,
+                        he_dev->rbps_phys);
+out_destroy_rbps_pool:
+        pci_pool_destroy(he_dev->rbps_pool);
+        return -ENOMEM;
 }
 
 static int __devinit
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 6b969f8c684f..01ce241dbeae 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -641,7 +641,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,
                                         pre = 1;
                                 break;
                         case round_nearest:
-                                pre = (br+(c<<div)/2)/(c<<div);
+                                pre = DIV_ROUND_CLOSEST(br, c<<div);
                                 // but p must be non-zero
                                 if (!pre)
                                         pre = 1;
@@ -671,7 +671,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,
                                         pre = DIV_ROUND_UP(br, c<<div);
                                         break;
                                 case round_nearest:
-                                        pre = (br+(c<<div)/2)/(c<<div);
+                                        pre = DIV_ROUND_CLOSEST(br, c<<div);
                                         break;
                                 default: /* round_up */
                                         pre = br/(c<<div);
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index e1c7611e9144..78c9736c3579 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -977,9 +977,7 @@ static void xdump( u_char*  cp, int  length, char*  prefix )
             else
                 pBuf += sprintf( pBuf, "." );
                 }
-        sprintf( pBuf, "\n" );
-        // SPrint(prntBuf);
-        printk(prntBuf);
+        printk("%s\n", prntBuf);
         count += col;
         pBuf = prntBuf;
     }
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 144a49f15220..cf97c34cbaf1 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -901,7 +901,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai)
                 clock_l(); udelay(5);
                 for (i = 128; i != 0; i >>= 1) {   /* write command out */
                         tmp = (lanai->conf1 & ~CONFIG1_PROMDATA) |
-                            (data & i) ? CONFIG1_PROMDATA : 0;
+                            ((data & i) ? CONFIG1_PROMDATA : 0);
                         if (lanai->conf1 != tmp) {
                                 set_config1(tmp);
                                 udelay(5);      /* Let new data settle */
@@ -1957,12 +1957,12 @@ static int __devinit lanai_pci_start(struct lanai_dev *lanai)
                 return -ENXIO;
         }
         pci_set_master(pci);
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) != 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) != 0) {
                 printk(KERN_WARNING DEV_LABEL
                     "(itf %d): No suitable DMA available.\n", lanai->number);
                 return -EBUSY;
         }
-        if (pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) != 0) {
+        if (pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) != 0) {
                 printk(KERN_WARNING DEV_LABEL
                     "(itf %d): No suitable DMA available.\n", lanai->number);
                 return -EBUSY;
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 6c828347c9cc..c5f5186d62a3 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -386,7 +386,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)
@@ -1104,7 +1104,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 +1207,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;
 }