summaryrefslogtreecommitdiffstats
path: root/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-04-26 21:15:20 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-04-26 21:15:20 -0500
commit6c2cc50051831fa502a8b082a312ca90e7039f3f (patch)
treebb474cc356d09fb7963eadaeb127a00f7fed6531 /0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch
parentd1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff)
downloadkernel-6c2cc50051831fa502a8b082a312ca90e7039f3f.tar.gz
kernel-6c2cc50051831fa502a8b082a312ca90e7039f3f.tar.xz
kernel-6c2cc50051831fa502a8b082a312ca90e7039f3f.zip
kernel-5.7.0-0.rc3.1
* Sun Apr 26 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.1] - v5.7-rc3 rebase - Add cec to the filter overrides ("Justin M. Forbes") - Add overrides to filter-modules.sh ("Justin M. Forbes") - Adjust the changelog update script to not push anything (Jeremy Cline) - Drop --target noarch from the rh-rpms make target (Jeremy Cline) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch')
-rw-r--r--0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch b/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch
index c6fdb5aa6..e5d3b26dd 100644
--- a/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch
+++ b/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch
@@ -1,4 +1,4 @@
-From 9b408dc1e89cfe36a8f715a7c7624687bb876028 Mon Sep 17 00:00:00 2001
+From 449da32f8ce7146e04b5b5d3d535336900cc4233 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Mon, 24 Feb 2020 14:07:48 +0000
Subject: [PATCH] backlight: lp855x: Ensure regulators are disabled on probe
@@ -64,7 +64,7 @@ index f68920131a4a..e94932c69f54 100644
- return ret;
+ goto disable_supply;
}
-
+
/*
@@ -471,24 +471,34 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
ret = lp855x_configure(lp);
@@ -73,7 +73,7 @@ index f68920131a4a..e94932c69f54 100644
- return ret;
+ goto disable_vddio;
}
-
+
ret = lp855x_backlight_register(lp);
if (ret) {
dev_err(lp->dev,
@@ -81,14 +81,14 @@ index f68920131a4a..e94932c69f54 100644
- return ret;
+ goto disable_vddio;
}
-
+
ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group);
if (ret) {
dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret);
- return ret;
+ goto disable_vddio;
}
-
+
backlight_update_status(lp->bl);
+
return 0;
@@ -102,10 +102,10 @@ index f68920131a4a..e94932c69f54 100644
+
+ return ret;
}
-
+
static int lp855x_remove(struct i2c_client *cl)
@@ -497,6 +507,8 @@ static int lp855x_remove(struct i2c_client *cl)
-
+
lp->bl->props.brightness = 0;
backlight_update_status(lp->bl);
+ if (lp->enable)
@@ -114,5 +114,5 @@ index f68920131a4a..e94932c69f54 100644
regulator_disable(lp->supply);
sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
--
-2.26.0
+2.26.2