Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / media / video / m5mols / m5mols_core.c

diff --git a/drivers/media/video/m5mols/m5mols_core.c b/drivers/media/video/m5mols/m5mols_core.c
index e92e9dda79b75db937a2877cdd541c2e8c02b74c..05ab3700647e286acf9b01ee994a07cd56eb8014 100644 (file)
--- a/drivers/media/video/m5mols/m5mols_core.c
+++ b/drivers/media/video/m5mols/m5mols_core.c
@@ -937,7 +937,7 @@ static int __devinit m5mols_probe(struct i2c_client *client,
                return -EINVAL;
        }
 
-       if (!pdata->irq) {
+       if (!client->irq) {
                dev_err(&client->dev, "Interrupt not assigned\n");
                return -EINVAL;
        }
@@ -974,7 +974,7 @@ static int __devinit m5mols_probe(struct i2c_client *client,
 
        init_waitqueue_head(&info->irq_waitq);
        INIT_WORK(&info->work_irq, m5mols_irq_work);
-       ret = request_irq(pdata->irq, m5mols_irq_handler,
+       ret = request_irq(client->irq, m5mols_irq_handler,
                          IRQF_TRIGGER_RISING, MODULE_NAME, sd);
        if (ret) {
                dev_err(&client->dev, "Interrupt request failed: %d\n", ret);
@@ -999,7 +999,7 @@ static int __devexit m5mols_remove(struct i2c_client *client)
        struct m5mols_info *info = to_m5mols(sd);
 
        v4l2_device_unregister_subdev(sd);
-       free_irq(info->pdata->irq, sd);
+       free_irq(client->irq, sd);
 
        regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
        gpio_free(info->pdata->gpio_reset);