From cb64b741417e73efabea3728b9090e488be02cd3 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 20 Dec 2004 22:00:10 +0000 Subject: [PATCH] Handle both pwm files naming scheme for 2.6 kernels (ticket #1844). git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2798 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/pwm/pwmconfig | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig index 1a9326ec..d77aee90 100755 --- a/prog/pwm/pwmconfig +++ b/prog/pwm/pwmconfig @@ -63,13 +63,14 @@ then exit 1 fi -if [ "$SYSFS" = "1" ] -then - MATCH='*/fan[1-9]_pwm' -else - MATCH='*/pwm[1-9]' -fi +MATCH='*/pwm[1-9]' PWM=`echo $MATCH` +if [ "$SYSFS" = "1" -a "$MATCH" = "$PWM" ] +then + # Deprecated naming scheme (used in kernels 2.6.5 to 2.6.9) + MATCH='*/fan[1-9]_pwm' + PWM=`echo $MATCH` +fi if [ "$MATCH" = "$PWM" ] then echo $0: 'There are no pwm-capable sensor modules installed'