mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 10:52:57 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
This commit is contained in:
@@ -50,6 +50,14 @@ disable_led_trigger ()
|
||||
fi
|
||||
}
|
||||
|
||||
# enable LED
|
||||
enable_led ()
|
||||
{
|
||||
if [ -d "/sys/class/leds/$1" ]; then
|
||||
echo "1" > /sys/class/leds/$1/brightness
|
||||
fi
|
||||
}
|
||||
|
||||
case "${1}" in
|
||||
start)
|
||||
# Alix LED start
|
||||
@@ -57,6 +65,11 @@ case "${1}" in
|
||||
setup_netdev_trigger alix:2 ${RED_DEV} rx
|
||||
setup_netdev_trigger alix:3 ${RED_DEV} tx
|
||||
|
||||
# Geos LED start
|
||||
setup_heartbeat_trigger geos:1
|
||||
setup_netdev_trigger geos:2 ${RED_DEV} rx
|
||||
setup_netdev_trigger geos:3 ${RED_DEV} tx
|
||||
|
||||
# Dreamplug
|
||||
setup_netdev_trigger dreamplug:green:wlan ${GREEN_DEV} tx rx
|
||||
setup_netdev_trigger dreamplug:blue:wlanap ${BLUE_DEV} tx rx
|
||||
@@ -80,9 +93,16 @@ case "${1}" in
|
||||
stop)
|
||||
# Alix LED stop
|
||||
disable_led_trigger alix:1
|
||||
enable_led alix:1
|
||||
disable_led_trigger alix:2
|
||||
disable_led_trigger alix:3
|
||||
|
||||
# Geos LED stop
|
||||
disable_led_trigger geos:1
|
||||
enable_led geos:1
|
||||
disable_led_trigger geos:2
|
||||
disable_led_trigger geos:3
|
||||
|
||||
# Dreamplug
|
||||
disable_led_trigger dreamplug:green:wlan
|
||||
disable_led_trigger dreamplug:blue:wlanap
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
diff -Naur linux-3.10.30.org/sound/pci/cs5535audio/cs5535audio.c linux-3.10.30/sound/pci/cs5535audio/cs5535audio.c
|
||||
--- linux-3.10.30.org/sound/pci/cs5535audio/cs5535audio.c 2014-02-13 22:48:15.000000000 +0100
|
||||
+++ linux-3.10.30/sound/pci/cs5535audio/cs5535audio.c 2014-02-15 12:45:49.545688703 +0100
|
||||
@@ -83,8 +83,8 @@
|
||||
break;
|
||||
udelay(1);
|
||||
} while (--timeout);
|
||||
- if (!timeout)
|
||||
- snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
|
||||
+// if (!timeout)
|
||||
+// snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
|
||||
}
|
||||
|
||||
static unsigned short snd_cs5535audio_codec_read(struct cs5535audio *cs5535au,
|
||||
@@ -108,9 +108,9 @@
|
||||
break;
|
||||
udelay(1);
|
||||
} while (--timeout);
|
||||
- if (!timeout)
|
||||
- snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
|
||||
- "Last value=0x%x\n", reg, val);
|
||||
+// if (!timeout)
|
||||
+// snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
|
||||
+// "Last value=0x%x\n", reg, val);
|
||||
|
||||
return (unsigned short) val;
|
||||
}
|
||||
Reference in New Issue
Block a user