diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-20 16:20:49 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-21 00:11:40 -0300 |
| commit | 1b3d46015dcb8e054f3d9cedf2e5553687e60323 (patch) | |
| tree | 6e452fc37d5005ca69b0e604a89ef969929b832d /kernels/linux-libre-knock | |
| parent | 25bb851840c2f2a0bd011ebd5f5441ad042a669d (diff) | |
linux-libre-knock-4.4.2_gnu-1: updating version
Diffstat (limited to 'kernels/linux-libre-knock')
| -rw-r--r-- | kernels/linux-libre-knock/PKGBUILD | 10 | ||||
| -rw-r--r-- | kernels/linux-libre-knock/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch | 24 |
2 files changed, 2 insertions, 32 deletions
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index 46adf6af2..eb747c0f4 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre-knock _pkgbasever=4.4-gnu -_pkgver=4.4.1-gnu +_pkgver=4.4.2-gnu _knockpatchver=4.2_2 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -49,7 +49,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' - 'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch' '0001-sdhci-revert.patch' '0001-4.4-revert-btrfs.patch' '0001-4.4-revert-xfs.patch' @@ -69,7 +68,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0009-ARM-dts-dove-add-Dove-divider-clocks.patch') sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' - 'ed09b329d879bb758374b6a76acb841cdf63a6638720378657fb2b6eeed6b265' + 'f82d7a08ab1fc0d810a74ff294f7757af71fa7f90db0038aabbf086c8006ba78' 'SKIP' 'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4' 'SKIP' @@ -84,7 +83,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' '570f3e9d21f340f6c3bc7edb4f4de07176c54ea2aeb84cc326084a412756cf33' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - 'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958' 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad' @@ -154,10 +152,6 @@ prepare() { # https://bugzilla.kernel.org/show_bug.cgi?id=106541 patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch" - # fixes #47805 kernel panics on platform modules - # https://bugzilla.kernel.org/show_bug.cgi?id=110751 - patch -Np1 -i "${srcdir}/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch" - # #47757 fix broken suspend from btrfs and xfs patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch" patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch" diff --git a/kernels/linux-libre-knock/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch b/kernels/linux-libre-knock/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch deleted file mode 100644 index 691ab79b9..000000000 --- a/kernels/linux-libre-knock/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) { |