Merge branch 'linus' into x86/i8259

[sfrench/cifs-2.6.git] / drivers / gpio / mcp23s08.c

diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c
index bb60e8c1a1f0621e3d06c8292d1007ab3e66c754..7f92fdd5f0e2888b2c719e67873a5a7f0b435267 100644 (file)
--- a/drivers/gpio/mcp23s08.c
+++ b/drivers/gpio/mcp23s08.c
@@ -168,7 +168,7 @@ static void mcp23s08_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 {
        struct mcp23s08 *mcp;
        char            bank;
-       unsigned        t;
+       int             t;
        unsigned        mask;
 
        mcp = container_of(chip, struct mcp23s08, chip);
@@ -239,6 +239,7 @@ static int mcp23s08_probe(struct spi_device *spi)
        mcp->chip.base = pdata->base;
        mcp->chip.ngpio = 8;
        mcp->chip.can_sleep = 1;
+       mcp->chip.owner = THIS_MODULE;
 
        spi_set_drvdata(spi, mcp);