bump to latest version
This commit is contained in:
parent
dd5fbece17
commit
20d56ca2c7
12
PKGBUILD
12
PKGBUILD
@ -4,8 +4,8 @@
|
||||
pkgbase=linux # Build stock -ARCH kernel
|
||||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcname=linux-4.4
|
||||
pkgver=4.4.1
|
||||
pkgrel=2
|
||||
pkgver=4.4.2
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
@ -21,20 +21,18 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
||||
'linux.preset'
|
||||
'change-default-console-loglevel.patch'
|
||||
'0001-sdhci-revert.patch'
|
||||
'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch'
|
||||
'0001-4.4-revert-btrfs.patch'
|
||||
'0001-4.4-revert-xfs.patch')
|
||||
|
||||
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
|
||||
'SKIP'
|
||||
'c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48'
|
||||
'5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c'
|
||||
'SKIP'
|
||||
'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
|
||||
'756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a'
|
||||
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||
'5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
|
||||
'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d'
|
||||
'51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
|
||||
'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad')
|
||||
validpgpkeys=(
|
||||
@ -58,10 +56,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"
|
||||
|
@ -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) {
|
Loading…
Reference in New Issue
Block a user