| Date | Tue, 15 Feb 2011 16:11:45 -0800 | From | Greg KH <> | Subject | [048/272] Staging: speakup: &&/|| confusion in silent_store() |
| |
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: roel kluin <roel.kluin@gmail.com>
commit e7bf352fcd85c33b0805da891fc97fea8b5e996e upstream.
Fix test: the branch is always taken.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/staging/speakup/kobjects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/staging/speakup/kobjects.c +++ b/drivers/staging/speakup/kobjects.c @@ -332,7 +332,7 @@ static ssize_t silent_store(struct kobje unsigned long flags; len = strlen(buf); - if (len > 0 || len < 3) { + if (len > 0 && len < 3) { ch = buf[0]; if (ch == '\n') ch = '0';
|