From e212f4f0de28b675bfed6cf512b4c07e9cdd22b1 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 16 Jan 2013 14:53:56 +0100 Subject: [PATCH] --- yaml --- r: 357587 b: refs/heads/master c: 6382a0614144901af1cbbfdf9b9a618f5dfb8548 h: refs/heads/master i: 357585: b45b6f9c9a4340db97b236aa67910d4c810caa48 357583: d43b304163b951e240a5df222acd3dbe12161148 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl-core.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f631697a1c90..72c7763dcbbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2e6c5758de94ec22686b30e7b906a3ddcd9896 +refs/heads/master: 6382a0614144901af1cbbfdf9b9a618f5dfb8548 diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c index 547fed540ef7..182708811065 100644 --- a/trunk/drivers/mfd/twl-core.c +++ b/trunk/drivers/mfd/twl-core.c @@ -1170,6 +1170,12 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) return -EINVAL; } + if (inuse) { + dev_dbg(&client->dev, "only one instance of %s allowed\n", + DRIVER_NAME); + return -EBUSY; + } + pdev = platform_device_alloc(DRIVER_NAME, -1); if (!pdev) { dev_err(&client->dev, "can't alloc pdev\n"); @@ -1188,12 +1194,6 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) goto free; } - if (inuse) { - dev_dbg(&client->dev, "driver is already in use\n"); - status = -EBUSY; - goto free; - } - if ((id->driver_data) & TWL6030_CLASS) { twl_id = TWL6030_CLASS_ID; twl_map = &twl6030_map[0];