diff options
author | 2016-04-11 10:41:07 +0300 | |
---|---|---|
committer | 2016-04-13 08:17:18 +0300 | |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/mfd/da9052-i2c.c | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/mfd/da9052-i2c.c')
-rw-r--r-- | kernel/drivers/mfd/da9052-i2c.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/drivers/mfd/da9052-i2c.c b/kernel/drivers/mfd/da9052-i2c.c index ec39287a2..2697ffb08 100644 --- a/kernel/drivers/mfd/da9052-i2c.c +++ b/kernel/drivers/mfd/da9052-i2c.c @@ -174,11 +174,7 @@ static int da9052_i2c_probe(struct i2c_client *client, return ret; } - ret = da9052_device_init(da9052, id->driver_data); - if (ret != 0) - return ret; - - return 0; + return da9052_device_init(da9052, id->driver_data); } static int da9052_i2c_remove(struct i2c_client *client) @@ -195,7 +191,6 @@ static struct i2c_driver da9052_i2c_driver = { .id_table = da9052_i2c_id, .driver = { .name = "da9052", - .owner = THIS_MODULE, #ifdef CONFIG_OF .of_match_table = dialog_dt_ids, #endif |