4 files changed, 20 insertions, 10 deletions

diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c
index 4edc120a6359..633cbba072f0 100644
--- a/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@ -132,8 +132,9 @@ static struct ds1wm_platform_data ds1wm_pdata = {
         .disable   = ds1wm_disable,
 };
 
-static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift)
+static int ds1wm_device_add(struct platform_device *pasic3_pdev, int bus_shift)
 {
+        struct device *pasic3_dev = &pasic3_pdev->dev;
         struct pasic3_data *asic = pasic3_dev->driver_data;
         struct platform_device *pdev;
         int ret;
@@ -144,8 +145,8 @@ static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift)
                 return -ENOMEM;
         }
 
-        ret = platform_device_add_resources(pdev, pdev->resource,
-                                                pdev->num_resources);
+        ret = platform_device_add_resources(pdev, pasic3_pdev->resource,
+                                                pasic3_pdev->num_resources);
         if (ret < 0) {
                 dev_dbg(pasic3_dev, "failed to add DS1WM resources\n");
                 goto exit_pdev_put;
@@ -207,7 +208,7 @@ static int __init pasic3_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        ret = ds1wm_device_add(dev, asic->bus_shift);
+        ret = ds1wm_device_add(pdev, asic->bus_shift);
         if (ret < 0)
                 dev_warn(dev, "failed to register DS1WM\n");
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 95244a7e7353..626ac083f4e0 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -213,9 +213,10 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
         void __iomem *base = host->base;
         char *ptr = buffer;
         u32 status;
+        int host_remain = host->size;
 
         do {
-                int count = host->size - (readl(base + MMCIFIFOCNT) << 2);
+                int count = host_remain - (readl(base + MMCIFIFOCNT) << 2);
 
                 if (count > remain)
                         count = remain;
@@ -227,6 +228,7 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
 
                 ptr += count;
                 remain -= count;
+                host_remain -= count;
 
                 if (remain == 0)
                         break;
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index ba6bd03a015f..a637910b02dd 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -693,11 +693,15 @@ static int __init am79c961_probe(struct platform_device *pdev)
          * done by the ether bootp loader.
          */
         dev->base_addr = res->start;
-        dev->irq = platform_get_irq(pdev, 0);
+        ret = platform_get_irq(pdev, 0);
 
-        ret = -ENODEV;
-        if (dev->irq < 0)
+        if (ret < 0) {
+                ret = -ENODEV;
                 goto nodev;
+        }
+        dev->irq = ret;
+
+        ret = -ENODEV;
         if (!request_region(dev->base_addr, 0x18, dev->name))
                 goto nodev;
 
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 4ffa2585429a..da5a02cb4f63 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1022,6 +1022,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         struct uart_port *port = &ourport->port;
         struct s3c2410_uartcfg *cfg;
         struct resource *res;
+        int ret;
 
         dbg("s3c24xx_serial_init_port: port=%p, platdev=%p\n", port, platdev);
 
@@ -1064,9 +1065,11 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
         port->mapbase   = res->start;
         port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
-        port->irq       = platform_get_irq(platdev, 0);
-        if (port->irq < 0)
+        ret = platform_get_irq(platdev, 0);
+        if (ret < 0)
                 port->irq = 0;
+        else
+                port->irq = ret;
 
         ourport->clk    = clk_get(&platdev->dev, "uart");