2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 5747997f8d7d..688e435b4d9a 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -361,11 +361,12 @@ static int ds1wm_probe(struct platform_device *pdev)
                 goto err1;
         }
         ds1wm_data->irq = res->start;
-        ds1wm_data->active_high = (res->flags & IORESOURCE_IRQ_HIGHEDGE) ?
-                1 : 0;
+        ds1wm_data->active_high = plat->active_high;
 
-        set_irq_type(ds1wm_data->irq, ds1wm_data->active_high ?
-                        IRQ_TYPE_EDGE_RISING : IRQ_TYPE_EDGE_FALLING);
+        if (res->flags & IORESOURCE_IRQ_HIGHEDGE)
+                set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_RISING);
+        if (res->flags & IORESOURCE_IRQ_LOWEDGE)
+                set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);
 
         ret = request_irq(ds1wm_data->irq, ds1wm_isr, IRQF_DISABLED,
                           "ds1wm", ds1wm_data);
diff --git a/include/linux/ds1wm.h b/include/linux/ds1wm.h
index 31f6e3c427fb..d3c65e48a2e7 100644
--- a/include/linux/ds1wm.h
+++ b/include/linux/ds1wm.h
@@ -6,6 +6,7 @@ struct ds1wm_platform_data {
                              * e.g. on h5xxx and h2200 this is 2
                              * (registers aligned to 4-byte boundaries),
                              * while on hx4700 this is 1 */
+        int active_high;
         void (*enable)(struct platform_device *pdev);
         void (*disable)(struct platform_device *pdev);
 };