From patchwork Sun Jul 6 16:47:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 4490051 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CE2089F26C for ; Sun, 6 Jul 2014 16:46:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E999120221 for ; Sun, 6 Jul 2014 16:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 126CF2021B for ; Sun, 6 Jul 2014 16:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751815AbaGFQqA (ORCPT ); Sun, 6 Jul 2014 12:46:00 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:59927 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287AbaGFQp6 (ORCPT ); Sun, 6 Jul 2014 12:45:58 -0400 Received: by mail-we0-f178.google.com with SMTP id x48so3369941wes.23 for ; Sun, 06 Jul 2014 09:45:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e5nAclEXviMePJZJQy9i7aOeoRYg8KCRMhoVMznV8WI=; b=ansXgnR8vR8f4AQAAxE9fc5tbMPXFP9G/HsoissImVusflWEYtV8grI8TpHZbFEPNy 5fV7IN2tb7GLYtKl3cIecFovALb/R6twhASOEYkI8g2u1UdcdUyYjt44LHybC9KZS/k9 xL+h8KoDf/chjwqOLplQ7OvwJhTEbkZJJvrqFFVbPXA09+oxdZhbRHOHnWnSFZTfikM/ KldZcWnnx+sm8T6SyV+cBZknlkSt/V5rDX8l753P3HaIQZ+ZhdErUoxbOC0LtPnRv1D9 DfweGYZzf6uJynt0yYr6s6nF/UQpenS/6MgOQx62LgSqxI9fc8ozHTRL0fdUAM4NimjR nZoQ== X-Gm-Message-State: ALoCoQn0hCf4j2U+LkkNqvJcP+nW8puurPChsYABR2UObXBHyymUmgsvbUXzclxbTFxeLRZqn4Mf X-Received: by 10.180.19.40 with SMTP id b8mr31543279wie.77.1404665156957; Sun, 06 Jul 2014 09:45:56 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id wi9sm83529441wjc.23.2014.07.06.09.45.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jul 2014 09:45:56 -0700 (PDT) From: Rickard Strandqvist To: David Brown , Daniel Walker Cc: Rickard Strandqvist , Bryan Huntsman , Greg Kroah-Hartman , Jiri Slaby , Grant Likely , Rob Herring , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2] tty: serial: msm_serial.c: Cleaning up uninitialized variables Date: Sun, 6 Jul 2014 18:47:12 +0200 Message-Id: <1404665232-14311-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Set reasonable initial value of some variables, in case they do not get set to something otherwise. And I've also added a plausibility control of the values. Signed-off-by: Rickard Strandqvist --- drivers/tty/serial/msm_serial.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 72000a6..4491108 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -917,7 +917,7 @@ static int __init msm_console_setup(struct console *co, char *options) { struct uart_port *port; struct msm_port *msm_port; - int baud, flow, bits, parity; + int baud = 115200, flow = 'n', bits = 8, parity = 'n'; if (unlikely(co->index >= UART_NR || co->index < 0)) return -ENXIO; @@ -930,17 +930,21 @@ static int __init msm_console_setup(struct console *co, char *options) msm_init_clock(port); - if (options) + if (options) { uart_parse_options(options, &baud, &parity, &bits, &flow); + if (baud < 300 || baud > 115200) + baud = 115200; + if (NULL == strchr("noeNOE", parity)) + parity = 'n'; + if (bits != 7) + bits = 8; + if (flow != 'r') + flow = 'n'; + } - bits = 8; - parity = 'n'; - flow = 'n'; msm_write(port, UART_MR2_BITS_PER_CHAR_8 | UART_MR2_STOP_BIT_LEN_ONE, UART_MR2); /* 8N1 */ - if (baud < 300 || baud > 115200) - baud = 115200; msm_set_baud_rate(port, baud); msm_reset(port);