lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-10-29 08:44:04 -07:00
parent 3242f9804b a8643430bc
commit 7fecf0a1f2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/twl4030-core.c
View File

@@ -795,7 +795,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
twl->client = i2c_new_dummy(client->adapter, twl->client = i2c_new_dummy(client->adapter,
twl->address); twl->address);
if (!twl->client) { if (!twl->client) {
dev_err(&twl->client->dev, dev_err(&client->dev,
"can't attach client %d\n", i); "can't attach client %d\n", i);
status = -ENOMEM; status = -ENOMEM;
goto fail; goto fail;

3
drivers/mfd/wm831x-irq.c
View File

@@ -507,6 +507,8 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
{ {
int i, ret; int i, ret;
mutex_init(&wm831x->irq_lock);
if (!irq) { if (!irq) {
dev_warn(wm831x->dev, dev_warn(wm831x->dev,
"No interrupt specified - functionality limited\n"); "No interrupt specified - functionality limited\n");
@@ -521,7 +523,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
} }
wm831x->irq = irq; wm831x->irq = irq;
mutex_init(&wm831x->irq_lock);
INIT_WORK(&wm831x->irq_work, wm831x_irq_worker); INIT_WORK(&wm831x->irq_work, wm831x_irq_worker);
/* Mask the individual interrupt sources */ /* Mask the individual interrupt sources */