aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/speakup
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-02-02 13:35:58 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-02 13:35:58 -0800
commit949c3676cd6b2717c2abda5d9b10e6d6d7daf741 (patch)
treef885084fc7061e072d4b0024256a5ab0cbb64c93 /drivers/staging/speakup
parent836aded1613dc93bebe7b1d2710f4a416725db50 (diff)
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadlinaro-lsk-949c3676cd6b2717c2abda5d9b10e6d6d7daf741.tar.gz
Staging: Merge branch 'staging-next' into 2.6.38-rc3
This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/speakup')
-rw-r--r--drivers/staging/speakup/kobjects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index 408bb9b3303..07a7f543259 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -332,7 +332,7 @@ static ssize_t silent_store(struct kobject *kobj, struct kobj_attribute *attr,
unsigned long flags;
len = strlen(buf);
- if (len > 0 || len < 3) {
+ if (len > 0 && len < 3) {
ch = buf[0];
if (ch == '\n')
ch = '0';