Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

module-atheros: fix module not loading in kernel 2.6.35 

This is a regression introduced in a74363c. The MOD_VARIANT variable was
not correctly set because in kernel 2.6.35 there is no device-tree
support.

The fix is to get the module variant from the sysfs as a fallback for
old kernels.

https://jira.digi.com/browse/DEL-1694

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 6357d71152c38c4713fc534b78b6c2993b201aa8)
This commit is contained in:
Javier Viguera 2015-07-16 14:22:15 +02:00
parent ff946261ef
commit 80c0eeab42
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros-pre-up
View File

@ -88,7 +88,8 @@ rm -f ${TMP_MACFILE}
# #
MACHINE="$(cat /proc/device-tree/digi,machine,name 2>/dev/null || \ MACHINE="$(cat /proc/device-tree/digi,machine,name 2>/dev/null || \
cat /sys/kernel/machine/name)" cat /sys/kernel/machine/name)"
MOD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant 2>/dev/null)" MOD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant 2>/dev/null || \
cat /sys/kernel/${MACHINE}/mod_variant)"
REGION_CODE="$(cat /proc/device-tree/digi,hwid,cert 2>/dev/null || \ REGION_CODE="$(cat /proc/device-tree/digi,hwid,cert 2>/dev/null || \
cat /sys/kernel/${MACHINE}/mod_cert)" cat /sys/kernel/${MACHINE}/mod_cert)"