mfd: Proper pcf50633 irq check

[safe/jmp/linux-2.6] / drivers / mfd / pcf50633-core.c

diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 1774f60..5439282 100644 (file)
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/irq.h>
+#include <linux/slab.h>
 
 #include <linux/mfd/pcf50633/core.h>
 
@@ -217,7 +218,7 @@ static struct attribute_group pcf_attr_group = {
 int pcf50633_register_irq(struct pcf50633 *pcf, int irq,
                        void (*handler) (int, void *), void *data)
 {
-       if (irq < 0 || irq > PCF50633_NUM_IRQ || !handler)
+       if (irq < 0 || irq >= PCF50633_NUM_IRQ || !handler)
                return -EINVAL;
 
        if (WARN_ON(pcf->irq_handler[irq].handler))
@@ -234,7 +235,7 @@ EXPORT_SYMBOL_GPL(pcf50633_register_irq);
 
 int pcf50633_free_irq(struct pcf50633 *pcf, int irq)
 {
-       if (irq < 0 || irq > PCF50633_NUM_IRQ)
+       if (irq < 0 || irq >= PCF50633_NUM_IRQ)
                return -EINVAL;
 
        mutex_lock(&pcf->lock);
@@ -553,9 +554,14 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
 {
        struct pcf50633 *pcf;
        struct pcf50633_platform_data *pdata = client->dev.platform_data;
-       int i, ret = 0;
+       int i, ret;
        int version, variant;
 
+       if (!client->irq) {
+               dev_err(&client->dev, "Missing IRQ\n");
+               return -ENOENT;
+       }
+
        pcf = kzalloc(sizeof(*pcf), GFP_KERNEL);
        if (!pcf)
                return -ENOMEM;
@@ -570,6 +576,12 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
        pcf->irq = client->irq;
        pcf->work_queue = create_singlethread_workqueue("pcf50633");
 
+       if (!pcf->work_queue) {
+               dev_err(&client->dev, "Failed to alloc workqueue\n");
+               ret = -ENOMEM;
+               goto err_free;
+       }
+
        INIT_WORK(&pcf->irq_work, pcf50633_irq_worker);
 
        version = pcf50633_reg_read(pcf, 0);
@@ -577,7 +589,7 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
        if (version < 0 || variant < 0) {
                dev_err(pcf->dev, "Unable to probe pcf50633\n");
                ret = -ENODEV;
-               goto err;
+               goto err_destroy_workqueue;
        }
 
        dev_info(pcf->dev, "Probed device version %d variant %d\n",
@@ -591,6 +603,14 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
        pcf50633_reg_write(pcf, PCF50633_REG_INT4M, 0x00);
        pcf50633_reg_write(pcf, PCF50633_REG_INT5M, 0x00);
 
+       ret = request_irq(client->irq, pcf50633_irq,
+                                       IRQF_TRIGGER_LOW, "pcf50633", pcf);
+
+       if (ret) {
+               dev_err(pcf->dev, "Failed to request IRQ %d\n", ret);
+               goto err_destroy_workqueue;
+       }
+
        /* Create sub devices */
        pcf50633_client_dev_register(pcf, "pcf50633-input",
                                                &pcf->input_pdev);
@@ -600,38 +620,27 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
                                                &pcf->mbc_pdev);
        pcf50633_client_dev_register(pcf, "pcf50633-adc",
                                                &pcf->adc_pdev);
+       pcf50633_client_dev_register(pcf, "pcf50633-backlight",
+                                               &pcf->bl_pdev);
+
 
        for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {
                struct platform_device *pdev;
 
                pdev = platform_device_alloc("pcf50633-regltr", i);
                if (!pdev) {
-                       dev_err(pcf->dev, "Cannot create regulator\n");
+                       dev_err(pcf->dev, "Cannot create regulator %d\n", i);
                        continue;
                }
 
                pdev->dev.parent = pcf->dev;
                platform_device_add_data(pdev, &pdata->reg_init_data[i],
                                        sizeof(pdata->reg_init_data[i]));
-               dev_set_drvdata(&pdev->dev, pcf);
                pcf->regulator_pdev[i] = pdev;
 
                platform_device_add(pdev);
        }
 
-       if (client->irq) {
-               ret = request_irq(client->irq, pcf50633_irq,
-                               IRQF_TRIGGER_LOW, "pcf50633", pcf);
-
-               if (ret) {
-                       dev_err(pcf->dev, "Failed to request IRQ %d\n", ret);
-                       goto err;
-               }
-       } else {
-               dev_err(pcf->dev, "No IRQ configured\n");
-               goto err;
-       }
-
        if (enable_irq_wake(client->irq) < 0)
                dev_err(pcf->dev, "IRQ %u cannot be enabled as wake-up source"
                        "in this hardware revision", client->irq);
@@ -645,9 +654,12 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
 
        return 0;
 
-err:
+err_destroy_workqueue:
        destroy_workqueue(pcf->work_queue);
+err_free:
+       i2c_set_clientdata(client, NULL);
        kfree(pcf);
+
        return ret;
 }
 
@@ -667,6 +679,7 @@ static int __devexit pcf50633_remove(struct i2c_client *client)
        for (i = 0; i < PCF50633_NUM_REGULATORS; i++)
                platform_device_unregister(pcf->regulator_pdev[i]);
 
+       i2c_set_clientdata(client, NULL);
        kfree(pcf);
 
        return 0;