Merge branch 'v5.5' into v5.7

2020-09-09 03:34:14 +01:00 · 2020-09-09 03:34:14 +01:00 · ebb9a9d82a
commit ebb9a9d82a
parent bb1422182b 783eff8779
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -150,6 +150,6 @@ fi
 alsactl restore

 #Force 3.5mm ('headphone') jack
-if [[ "$kernel_ver" =~ ^4\.*$ ]]; then
+if aplay -l | grep -q "bcm2835 ALSA"; then
    amixer cset numid=3 1 || true
 fi