From patchwork Fri May 21 19:48:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 444952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 231B2C4707D for ; Fri, 21 May 2021 19:48:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2BAA613E1 for ; Fri, 21 May 2021 19:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235919AbhEUTtg (ORCPT ); Fri, 21 May 2021 15:49:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51009 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbhEUTtg (ORCPT ); Fri, 21 May 2021 15:49:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621626492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=dcVKe0qdt5wPmssTiHpynTzWxX54hdMY2B36rci5X+Q=; b=J++/KxGQEocKpjRIRcFQGc+6qqHA8USJfHh+RXYbcHRgBW4FZI/5MN85xdl4H6BVxAgF2w PJHJb4hpQldE/hW8UxCr7f+DdAGcDy4/60RiUJRijGhTB2yrD/v1jQnWAYCyy6dmR4VTtB SloJsqyHlYLq6/95JfuUy7lE2V9eoNA= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-202-Bs0EDtvoOvCH2iQLDkP0Vg-1; Fri, 21 May 2021 15:48:10 -0400 X-MC-Unique: Bs0EDtvoOvCH2iQLDkP0Vg-1 Received: by mail-ot1-f72.google.com with SMTP id d17-20020a0568300051b02902eef7abfb41so13756971otp.17 for ; Fri, 21 May 2021 12:48:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dcVKe0qdt5wPmssTiHpynTzWxX54hdMY2B36rci5X+Q=; b=fu1t0nOPLhhFhNnm6RgDr7mIwl+cYPJYGgBJy1zwSoh+L/iuXHbjxlRG3j+gF//nu9 NUwSKE4NAKxNs/Cioga9BeKocBca4OxEnd+kTl0+OiLKvP/gdlr1GIazWGFXUWVHERk+ xqnBkpnTQKY/klY2OV9N/5jCZSNyspKxCpV/rimnk5tjuG8T9VWVhnoWGwqNwBTex8L+ pvFhN0qvU0rZWWc6vUTh9fjqsvBy1RkJ2WDDwCWQd/M8FuPykjYnqPqbpKe/f2QRN0IT usYO+rCrHiyE8X5e/QCURvZPsKJCnb4Za5l3sqqUhouVVmPAH0zz0S86tk2dh8w82hgl LDIw== X-Gm-Message-State: AOAM530DnDoOZpOrdWuYtXyCKV+vsuXXYYKMMwPnIOGXf8Z6ESlp8F5i KQB7tt+45j3yIx7fjjQN3EWQUx2V2rCPvRYUa2jJ/y3njxH1ChK5MS5VKvb8PGPsWiBta8M24w2 JZHYZXX8MRL8yde0G7QqzvSM= X-Received: by 2002:a05:6808:6c5:: with SMTP id m5mr3394624oih.128.1621626490083; Fri, 21 May 2021 12:48:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYrYQGPQcv+yBq3l/flebYi1hTX+R84vJTx8eoodbyd7DfEsBjcEW5UppYT9L2Rb+H4ngnOw== X-Received: by 2002:a05:6808:6c5:: with SMTP id m5mr3394619oih.128.1621626489952; Fri, 21 May 2021 12:48:09 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id w20sm1302157oic.54.2021.05.21.12.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 12:48:09 -0700 (PDT) From: trix@redhat.com To: mchehab@kernel.org, sakari.ailus@linux.intel.com, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, drv@mailo.com, martinsdecarvalhobeatriz@gmail.com Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] media: staging: atomisp: improve error handling in gc2235_detect() Date: Fri, 21 May 2021 12:48:05 -0700 Message-Id: <20210521194805.2078135-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Tom Rix Static analysis reports this representative problem atomisp-gc2235.c:867:20: warning: The right operand of '|' is a garbage value id = ((high << 8) | low); ^ ~~~ When gc2235_read_reg() fails, its return val is never written. For gc2235_detect(), high and low are or-ed and compared with GC2235_ID, 0x2235. Initialize both to 0 and skip checking the read returns, it's errors are not passed up, only -ENODEV is. Signed-off-by: Tom Rix --- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c index 38defa0f81513..3b6e02b1f45d1 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c @@ -849,21 +849,14 @@ static int gc2235_get_fmt(struct v4l2_subdev *sd, static int gc2235_detect(struct i2c_client *client) { struct i2c_adapter *adapter = client->adapter; - u16 high, low; - int ret; + u16 high = 0, low = 0; u16 id; if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) return -ENODEV; - ret = gc2235_read_reg(client, GC2235_8BIT, - GC2235_SENSOR_ID_H, &high); - if (ret) { - dev_err(&client->dev, "sensor_id_high = 0x%x\n", high); - return -ENODEV; - } - ret = gc2235_read_reg(client, GC2235_8BIT, - GC2235_SENSOR_ID_L, &low); + gc2235_read_reg(client, GC2235_8BIT, GC2235_SENSOR_ID_H, &high); + gc2235_read_reg(client, GC2235_8BIT, GC2235_SENSOR_ID_L, &low); id = ((high << 8) | low); if (id != GC2235_ID) {