diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-07-27 13:48:17 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-07-27 13:48:17 +0300 |
| commit | ca31fef11dc83e672415d5925a134749761329bd (patch) | |
| tree | 8eb6a489e2d6dd117300f40ed8fc945a06bb6eee /drivers/mfd/da9063-i2c.c | |
| parent | ba6cd766e0bf933611dc66fcb86f72ac80a446bc (diff) | |
| parent | 15d27b15de965043d6f8e23bc7f34386fcd1a772 (diff) | |
| download | linux-ca31fef11dc83e672415d5925a134749761329bd.tar.xz | |
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
Required bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/mfd/da9063-i2c.c')
| -rw-r--r-- | drivers/mfd/da9063-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c index 783a14af18e2..4b7f707b7952 100644 --- a/drivers/mfd/da9063-i2c.c +++ b/drivers/mfd/da9063-i2c.c @@ -448,7 +448,7 @@ static int da9063_i2c_probe(struct i2c_client *i2c, DA9063_TWOWIRE_TO); if (ret < 0) { dev_err(da9063->dev, "Failed to set Two-Wire Bus Mode.\n"); - return -EIO; + return ret; } } |