From patchwork Fri Jun 22 11:19:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 50473 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWK7C-0002ug-4t; Fri, 22 Jun 2018 11:20:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933291AbeFVLUD (ORCPT + 1 other); Fri, 22 Jun 2018 07:20:03 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:56498 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933214AbeFVLUC (ORCPT ); Fri, 22 Jun 2018 07:20:02 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5MBJBbx065311; Fri, 22 Jun 2018 11:20:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2017-10-26; bh=2P91pVYfSB66PUw4ckl79oQBMkC6mpAYQTXESnbB7R0=; b=bmmS3NNZwhJ61E5M4Gjvk+wG/0DB2/kNUxXrMGlSDZMcpK6yQ5Ei9YzAt8duUjqunl0+ cgSOyp906VlL4o1G6iHpraxbit2qJgE3I1mHEh90cdtZseQ39KuewPq7GGH/GSVtzTVn sd2eIJuHKU0VA3mgFhJF63f8xUmnRcavA7jqqlo9XPHd7IPYfpKmHuuM+H5lKG9jt7bN HBydl2zwcPukCR+zFc7ebio5tsOeJwbURg6uGkShR6ab3oSt/tvY13tavaz5QVR10HK4 O+EyXv2E8/lv/ElXhg+fM4c4hiJ8eaprIMuszQIaSbDXic3Ahn9xqjMQeBV5vCoLHf1m CQ== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2120.oracle.com with ESMTP id 2jrp8hskbp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Jun 2018 11:20:00 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5MBJxC7004523 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Jun 2018 11:19:59 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w5MBJxjp004276; Fri, 22 Jun 2018 11:19:59 GMT Received: from kili.mountain (/41.202.241.28) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 22 Jun 2018 04:19:58 -0700 Date: Fri, 22 Jun 2018 14:19:48 +0300 From: Dan Carpenter To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] media: sr030pc30: inconsistent NULL checking in sr030pc30_base_config() Message-ID: <20180622111947.tormf7s7an5vj4lg@kili.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: NeoMutt/20170113 (1.7.2) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8931 signatures=668703 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1806220129 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org If info->pdata is NULL then we would oops on the next line. And we can flip the "ret" test around and give up if a failure has already occured. Signed-off-by: Dan Carpenter diff --git a/drivers/media/i2c/sr030pc30.c b/drivers/media/i2c/sr030pc30.c index 2a4882cddc51..4ebd00198d34 100644 --- a/drivers/media/i2c/sr030pc30.c +++ b/drivers/media/i2c/sr030pc30.c @@ -569,8 +569,8 @@ static int sr030pc30_base_config(struct v4l2_subdev *sd) if (!ret) ret = sr030pc30_pwr_ctrl(sd, false, false); - if (!ret && !info->pdata) - return ret; + if (ret || !info->pdata) + return -EIO; expmin = EXPOS_MIN_MS * info->pdata->clk_rate / (8 * 1000); expmax = EXPOS_MAX_MS * info->pdata->clk_rate / (8 * 1000);