diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-03 00:52:11 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-03 00:52:11 -0300 |
commit | 900d532d765238773b29314e48935855157642a9 (patch) | |
tree | 1415f2a8fc69183f1f1bf53f93ba255cd494f114 /libre-testing/linux-libre-pck/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch | |
parent | 7d28f1ecd4378cdc8cf7eb9c7f89493945a94ce0 (diff) |
linux-libre-pck-4.4.1_gnu.pck1-1: updating version
* fix debug output - FS#47849 -> https://bugs.archlinux.org/task/47849
* fix FS#47757 -> https://bugs.archlinux.org/task/47757
Diffstat (limited to 'libre-testing/linux-libre-pck/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch')
-rw-r--r-- | libre-testing/linux-libre-pck/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libre-testing/linux-libre-pck/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch b/libre-testing/linux-libre-pck/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch deleted file mode 100644 index 691ab79b9..000000000 --- a/libre-testing/linux-libre-pck/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/drivers/base/platform.c b/drivers/base/platform.c -index 1dd6d3b..176b59f 100644 ---- a/drivers/base/platform.c -+++ b/drivers/base/platform.c -@@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev) - return ret; - - ret = dev_pm_domain_attach(_dev, true); -- if (ret != -EPROBE_DEFER && drv->probe) { -- ret = drv->probe(dev); -- if (ret) -- dev_pm_domain_detach(_dev, true); -+ if (ret != -EPROBE_DEFER) { -+ if (drv->probe) { -+ ret = drv->probe(dev); -+ if (ret) -+ dev_pm_domain_detach(_dev, true); -+ } else { -+ /* don't fail if just dev_pm_domain_attach failed */ -+ ret = 0; -+ } - } - - if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) { |