From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753069AbdICODp (ORCPT ); Sun, 3 Sep 2017 10:03:45 -0400 Received: from mout.web.de ([212.227.15.4]:58097 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752853AbdICODm (ORCPT ); Sun, 3 Sep 2017 10:03:42 -0400 Subject: [PATCH 2/2] [media] meye: Adjust two function calls together with a variable assignment From: SF Markus Elfring To: linux-media@vger.kernel.org, Hans Verkuil , Masahiro Yamada , Mauro Carvalho Chehab , Pan Bian , Sakari Ailus Cc: LKML , kernel-janitors@vger.kernel.org References: <4370c644-e440-1268-089b-8a8686bbcd5c@users.sourceforge.net> Message-ID: <7f538823-de13-4246-7482-fcc889385328@users.sourceforge.net> Date: Sun, 3 Sep 2017 16:03:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <4370c644-e440-1268-089b-8a8686bbcd5c@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:Jf3H+NwobDmZmZzDj1KQSTy088qkZG8SxbLQXENsf+i/bX21YrS P5rNAtCmiN433x9pUVxsMa2XHR/ghmsUiMGIYaVolea17VCia7EDzvCSUnpvysr6jrF9GJy 6HeU9PvwWdVZsFQsoE/LG+KmZ5gMQOGRdoe3G9FTtxP/lD5w84RFcHl4s7qhoN/Jf5HKrPb 6YkPFgmomdM7b2KhLBSSA== X-UI-Out-Filterresults: notjunk:1;V01:K0:P5J5a6YRGaU=:m3wvbfQ6RWTN8r9gA6gksx rExlGMHPWRM/BpbO8nPgwVYOas2C0cPFffT/lB5VVSv3qBaYd7VMB/sxWJjxGqDiaqYiWNxqT AgRxilXiKZHo8dm9ppvOldVEfclWADgp/XDZ36leERV6vlhRnn63WqYL8bpkKCeTqeRQkZCju KO4MPw/fRYbmy/CzD08vi0b0lXFfoCuGVDg5RvlHrT9Zlb/4+CXghaw2CMnk015g9iMip5q3x ddSyYHqUREwQJ7XDFEyuAUpWMtElycIWtxLYiOZo71s0mXHR+NnScjbLbCG9JNl5UyW4dqP66 vr3jGZx0R5OaN6uWarFLMwytG9mCyAkBBxQj7rb+wFu6yd6lOYw0FHtjnnSwM+NoF1aM7IjfH ESHD2SEHRdn84KGeOQM703bgXe0Z4CO3qMKrmxGtxClCID3zm/KMNBZ7ZvZPeehjUjHfLK69g 8iuIi+IVvxQRGTLjypR7D+sowY6mQKeINk5fGAvyGDJpIGj43Wjao9eU4NWffk85bdwfFBYQN l08mhts70w6mr5O1CDs5oupLy9wAfCVPYQvAsaNbf9uI1HMZ4xfwbQngKoyWOEPXNUAHQ3Qxz or1e+vZV4uhUOhl8Cr6G0q1dRMBnHW3Tu7UnctXekw790XZHXc32cjq+avuECeuSiHXVK1HTj tRQHCY83P8VY2493de90DldkdirbR4JBEA16BKFBf9xUalj7fvz4DQP8+hmyYR0t7yiqnrN+f mRAwNyclQ3X0LXQzqjLITuusjNaoQAjAXgAylExSTxgC4ZAyKVF+XpLqSMbOHdwfHyS29TEp/ vwN9R3nCHGvaCMWWIl5IrVsI1ikDVhHt9Ope9xtqmKxiv5jB+I= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 3 Sep 2017 15:41:53 +0200 The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/media/pci/meye/meye.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c index db36040770a6..9b69a07c1d5b 100644 --- a/drivers/media/pci/meye/meye.c +++ b/drivers/media/pci/meye/meye.c @@ -1642,14 +1642,15 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) meye.vdev = meye_template; meye.vdev.v4l2_dev = &meye.v4l2_dev; - ret = -EIO; - if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) { + ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1); + if (ret) { v4l2_err(v4l2_dev, "meye: unable to power on the camera\n"); v4l2_err(v4l2_dev, "meye: did you enable the camera in sonypi using the module options ?\n"); goto outsonypienable; } - if ((ret = pci_enable_device(meye.mchip_dev))) { + ret = pci_enable_device(meye.mchip_dev); + if (ret) { v4l2_err(v4l2_dev, "meye: pci_enable_device failed\n"); goto outenabledev; } -- 2.14.1