From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 1 Sep 2007 05:25:44 +0000 (+0000)
Subject: small rdc-2.6 fixes (from sn9, thanks!)
X-Git-Tag: reboot~28249
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ef9d1183593826eebda8cbdd406cf2f54ee09949;p=oweals%2Fopenwrt.git

small rdc-2.6 fixes (from sn9, thanks!)

SVN-Revision: 8568
---

diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index 51c8e6e90d..381a961e98 100644
--- a/target/linux/rdc-2.6/config/default
+++ b/target/linux/rdc-2.6/config/default
@@ -28,12 +28,9 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CPU5_WDT is not set
 # CONFIG_CPU_FREQ is not set
-CONFIG_CRC_ITU_T=y
 CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DEV_GEODE=m
 # CONFIG_CRYPTO_DEV_PADLOCK is not set
-CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_DCDBAS is not set
diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
index 2c3886771d..dbd03270f1 100644
--- a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
+++ b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
@@ -19,7 +19,7 @@
 
 static inline int rdc_gpio_is_valid(unsigned gpio)
 {
-	return ((gpio > RDC_MAX_GPIO) ? 0 : 1);
+	return (gpio <= RDC_MAX_GPIO);
 }
 
 static unsigned int rdc_gpio_read(unsigned gpio)
@@ -53,6 +53,8 @@ int rdc_gpio_get_value(unsigned gpio)
 {
 	if (rdc_gpio_is_valid(gpio))
 		return (int)rdc_gpio_read(gpio);
+	else
+		return -EINVAL;
 }
 EXPORT_SYMBOL(rdc_gpio_get_value);
 
diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/wdt.c b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/wdt.c
index 12ae4c5ec1..39956f35a7 100644
--- a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/wdt.c
+++ b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/wdt.c
@@ -212,7 +212,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
 
 	if ( (err = misc_register(&rdc321x_wdt_misc)) < 0 ) {
 		printk(KERN_ERR PFX "misc_register failed\n");
-		goto no_misc;
+		return err;
 	}
 
 	/* Reset the watchdog */
@@ -230,9 +230,6 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
 	printk(KERN_INFO PFX "init success\n");
 
 	return 0;
-
-no_misc:
-	return err;
 }
 
 static int rdc321x_wdt_remove(struct platform_device *pdev)