diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
commit | 3f60db4bde17088feed5f143582d7661cdbb9a01 (patch) | |
tree | 21a7866ae6d199cfa8f619ced9500687bdf84f18 /drivers/gpio/gpio-ml-ioh.c | |
parent | 5e36097889725dbe4f098c3f1e93cb2f21cae6ee (diff) | |
parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) |
Merge commit 'v3.3-rc4'
Diffstat (limited to 'drivers/gpio/gpio-ml-ioh.c')
-rw-r--r-- | drivers/gpio/gpio-ml-ioh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c index 03d6dd5dcb77..f0febe5b8221 100644 --- a/drivers/gpio/gpio-ml-ioh.c +++ b/drivers/gpio/gpio-ml-ioh.c | |||
@@ -448,6 +448,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev, | |||
448 | chip->reg = chip->base; | 448 | chip->reg = chip->base; |
449 | chip->ch = i; | 449 | chip->ch = i; |
450 | mutex_init(&chip->lock); | 450 | mutex_init(&chip->lock); |
451 | spin_lock_init(&chip->spinlock); | ||
451 | ioh_gpio_setup(chip, num_ports[i]); | 452 | ioh_gpio_setup(chip, num_ports[i]); |
452 | ret = gpiochip_add(&chip->gpio); | 453 | ret = gpiochip_add(&chip->gpio); |
453 | if (ret) { | 454 | if (ret) { |