diff options
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 3 | ||||
| -rw-r--r-- | drivers/misc/enclosure.c | 1 | ||||
| -rw-r--r-- | drivers/misc/sgi-gru/gruprocfs.c | 13 |
4 files changed, 8 insertions, 21 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 72c10192d802..281b61b3b5f3 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -13,10 +13,6 @@ menuconfig MISC_DEVICES if MISC_DEVICES -config ANDROID_PMEM - bool "Android pmem allocator" - default y - config ATMEL_PWM tristate "Atmel AT32/AT91 PWM support" depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 @@ -242,14 +238,6 @@ config MXS_PERSISTENT depends on ARCH_MXS default y -config UID_STAT - bool "UID based statistics tracking exported to /proc/uid_stat" - default n - -config FSL_CACHE - tristate "Freescale Cache manipulate driver" - default n - source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index c435ec82d664..03dd5ee05ce2 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -21,8 +21,5 @@ obj-$(CONFIG_HP_ILO) += hpilo.o obj-$(CONFIG_ISL29003) += isl29003.o obj-$(CONFIG_C2PORT) += c2port/ obj-$(CONFIG_MXS_PERSISTENT) += mxs-persistent.o -obj-$(CONFIG_ANDROID_PMEM) += pmem.o -obj-$(CONFIG_UID_STAT) += uid_stat.o -obj-$(CONFIG_FSL_CACHE) += fsl_cache.o obj-y += eeprom/ obj-y += cb710/ diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c index 348443bdb23b..8393376b1080 100644 --- a/drivers/misc/enclosure.c +++ b/drivers/misc/enclosure.c @@ -362,6 +362,7 @@ static const char *const enclosure_status [] = { [ENCLOSURE_STATUS_NOT_INSTALLED] = "not installed", [ENCLOSURE_STATUS_UNKNOWN] = "unknown", [ENCLOSURE_STATUS_UNAVAILABLE] = "unavailable", + [ENCLOSURE_STATUS_MAX] = NULL, }; static const char *const enclosure_type [] = { diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c index 9cbf95bedce6..de530d9942d2 100644 --- a/drivers/misc/sgi-gru/gruprocfs.c +++ b/drivers/misc/sgi-gru/gruprocfs.c @@ -161,14 +161,15 @@ static int options_show(struct seq_file *s, void *p) static ssize_t options_write(struct file *file, const char __user *userbuf, size_t count, loff_t *data) { - unsigned long val; - char buf[80]; + char buf[20]; - if (strncpy_from_user(buf, userbuf, sizeof(buf) - 1) < 0) + if (count >= sizeof(buf)) + return -EINVAL; + if (copy_from_user(buf, userbuf, count)) return -EFAULT; - buf[count - 1] = '\0'; - if (!strict_strtoul(buf, 10, &val)) - gru_options = val; + buf[count] = '\0'; + if (strict_strtoul(buf, 0, &gru_options)) + return -EINVAL; return count; } |