w1: ds1wm: silence interrupts on HW before claiming the interrupt

w1: ds1wm: silence interrupts on HW before claiming the interrupt.
This way avoid possible invalid interrupts in the initialization phase.

Signed-off-by: Johannes Poehlmann <johannes.poehlmann@izt-labs.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index f8a3ba004c09321b0b67526a3d2a654f48dc3e70..53143797d71a205403a45dc2bd3ec9408cecb9fa 100644 (file)
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -509,6 +509,7 @@ static int ds1wm_probe(struct platform_device *pdev)
        struct ds1wm_driver_data *plat;
        struct resource *res;
        int ret;
+       u8 inten;
 
        if (!pdev)
                return -ENODEV;
@@ -562,6 +563,11 @@ static int ds1wm_probe(struct platform_device *pdev)
        ds1wm_data->int_en_reg_none = (plat->active_high ? DS1WM_INTEN_IAS : 0);
        ds1wm_data->reset_recover_delay = plat->reset_recover_delay;
 
+       /* Mask interrupts, set IAS before claiming interrupt */
+       inten = ds1wm_read_register(ds1wm_data, DS1WM_INT_EN);
+       ds1wm_write_register(ds1wm_data,
+               DS1WM_INT_EN, ds1wm_data->int_en_reg_none);
+
        if (res->flags & IORESOURCE_IRQ_HIGHEDGE)
                irq_set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_RISING);
        if (res->flags & IORESOURCE_IRQ_LOWEDGE)