diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:44:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:44:04 -0700 |
| commit | 7fecf0a1f2f0dc334d41f1044198fb5aa6be1905 (patch) | |
| tree | 30b20500140e0ad628da8e22a8b42d99138fc899 | |
| parent | 3242f9804ba992c867360e2b57efc268b8e4e175 (diff) | |
| parent | a8643430bc82aa3d272b21df2e1feb502bb8aacb (diff) | |
| download | linux-3.10-7fecf0a1f2f0dc334d41f1044198fb5aa6be1905.tar.gz linux-3.10-7fecf0a1f2f0dc334d41f1044198fb5aa6be1905.tar.bz2 linux-3.10-7fecf0a1f2f0dc334d41f1044198fb5aa6be1905.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Do not dereference null pointer in twl4030 error path
mfd: Always initialise WM831x IRQ mutex
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/wm831x-irq.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index e832e975da6..a1c47ee95c0 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -795,7 +795,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) twl->client = i2c_new_dummy(client->adapter, twl->address); if (!twl->client) { - dev_err(&twl->client->dev, + dev_err(&client->dev, "can't attach client %d\n", i); status = -ENOMEM; goto fail; diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c index d3015dfb913..ac056ea6b66 100644 --- a/drivers/mfd/wm831x-irq.c +++ b/drivers/mfd/wm831x-irq.c @@ -507,6 +507,8 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) { int i, ret; + mutex_init(&wm831x->irq_lock); + if (!irq) { dev_warn(wm831x->dev, "No interrupt specified - functionality limited\n"); @@ -521,7 +523,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) } wm831x->irq = irq; - mutex_init(&wm831x->irq_lock); INIT_WORK(&wm831x->irq_work, wm831x_irq_worker); /* Mask the individual interrupt sources */ |