Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / drivers / gpio / gpio-mcp23s08.c

diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 93ee7da..da9c316 100644 (file)
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -655,8 +655,9 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
 
        mcp->irq_controller = pdata->irq_controller;
        if (mcp->irq && mcp->irq_controller) {
-               mcp->irq_active_high = of_property_read_bool(mcp->chip.of_node,
-                               "microchip,irq-active-high");
+               mcp->irq_active_high =
+                       of_property_read_bool(mcp->chip.dev->of_node,
+                                             "microchip,irq-active-high");
 
                if (type == MCP_TYPE_017)
                        mirror = pdata->mirror;