From patchwork Thu Jan 18 10:28:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 10172813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C30B5602DC for ; Thu, 18 Jan 2018 10:29:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF75D23B3C for ; Thu, 18 Jan 2018 10:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A32E22623D; Thu, 18 Jan 2018 10:29:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 26FFA23B3C for ; Thu, 18 Jan 2018 10:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=EDBHI3DoYEaGJ0mZkxQ0dB0CECmAg1gifP5BWwN0Mis=; b=e/7PvZEGX77S31 munZ6owce63XfvWChrtwlMlIOe5JYuVX7B0wlQpm4SP5dyZ2qLgFGQ5v0h1YeU4SlmW4aRN5Gm3Df /Cm/VxGT0qoe+8ShJ49ONmAmDCw+8rkzsHzdRoi5ZBVPECNQIp/LxBM/FR82SGMGziCrxm9nEEohf lQbNCZd211XI8II4WHYWX0nl1+TDFqw35D1IicaUQSz/5uTET7hbFYl2UGD09BABJ1BmxW44UBN3w PtXZptllTEo7KPASfdhV9aBfJWS2Hkj0TUeEFZcyVpKgOSTnGnpWzmgowK9bn/JWBGAfLRD3Z4SpP 1BAWn5JC8KeJGah2avcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ec7RT-00089Q-0H; Thu, 18 Jan 2018 10:29:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ec7RR-000894-9V for linux-arm-kernel@bombadil.infradead.org; Thu, 18 Jan 2018 10:29:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=H6g9G5+u7bdlwq6h0/roHoUxeJGLt+PYkUpYhHIKaE8=; b=lExbOVdG7becBf2MB/cNl5hHG8 K6co7+A6cVxoXXwXr5z7AM5BmHk1CwYCP+x0N0WSFZHmGbgGJ1JRPCZLViyZbpdeQRds4YIeY8afv GCtSZqua1hGQZM56rslQWVnmaUtUK1hg68sSLbIvIlhW0SXztMFBx+aP0FdKp5BaxX0Ql2vcQ2iqV X4UJfP8r9JzCG5d6Ju+YFHJdaRNUtcx2U9n8m9DKBcwf0xg08J54WH8rw3JJJkWfe71k0yMqCgr8m lCIcoFI8d7qYWwshSC6b6PAzr4QQsC1jCTnmIipViNStBTvzhc861upZns3omPhU3kDiL6AcHWTOD CdC4nvuQ==; Received: from aserp2130.oracle.com ([141.146.126.79]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ec7RN-0006eL-PW for linux-arm-kernel@lists.infradead.org; Thu, 18 Jan 2018 10:29:03 +0000 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w0IARiop195999; Thu, 18 Jan 2018 10:28:32 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=H6g9G5+u7bdlwq6h0/roHoUxeJGLt+PYkUpYhHIKaE8=; b=nAMt45Ta8ka7aOtXWNj/mffCfIbfb394Ky7dyd0u6nMW5o3E4lPTFOvYv1uBZ8apVkaU EuziFs/mslNG7m3C46t1bZKgMG0d1KXBLnjJejKCB/OI8t4dYl+2ugI1IO5zcHr+HDGX RF9di+i/CejjdEz+roJhy+FAkPKdQ8L/qaPNUZSqVQVmq+2P18XUaXJC9s1Y0HlKq2lA LU1CCMHAbuML5SPT6u+1TNOvzeXdE4NPVNh6Etg5W/oAC14rglG157zCgu2n32gF9QOY K8TMpalXKC9wbLznY6q/EOPDu0i23toukcS4liAhnMNS98AVhV/F6BldEXbVOgLr2TAz vw== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2130.oracle.com with ESMTP id 2fjstt80b2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Jan 2018 10:28:32 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w0IASVtm018140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 18 Jan 2018 10:28:31 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w0IASUaI019734; Thu, 18 Jan 2018 10:28:30 GMT Received: from mwanda (/41.202.241.56) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 18 Jan 2018 02:28:30 -0800 Date: Thu, 18 Jan 2018 13:28:23 +0300 From: Dan Carpenter To: Michal Simek , Dhaval Shah Subject: [PATCH] soc: xilinx: xlnx_vcu: Fix && vs & typo Message-ID: <20180118102823.GA21064@mwanda> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.2 (2017-12-15) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8777 signatures=668653 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=722 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801180149 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180118_102902_110018_B10FEA73 X-CRM114-Status: UNSURE ( 6.57 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We accidentally used a logical AND instead of a bitwise AND here. Fixes: cee8113a295a ("soc: xilinx: xlnx_vcu: Add Xilinx ZYNQMP VCU logicoreIP init driver") Signed-off-by: Dan Carpenter diff --git a/drivers/soc/xilinx/xlnx_vcu.c b/drivers/soc/xilinx/xlnx_vcu.c index c1d6f1b190b6..a840c0272135 100644 --- a/drivers/soc/xilinx/xlnx_vcu.c +++ b/drivers/soc/xilinx/xlnx_vcu.c @@ -334,7 +334,7 @@ static int xvcu_set_vcu_pll_info(struct xvcu_device *xvcu) */ vcu_pll_ctrl = xvcu_read(xvcu->vcu_slcr_ba, VCU_PLL_CTRL); clkoutdiv = vcu_pll_ctrl >> VCU_PLL_CTRL_CLKOUTDIV_SHIFT; - clkoutdiv = clkoutdiv && VCU_PLL_CTRL_CLKOUTDIV_MASK; + clkoutdiv = clkoutdiv & VCU_PLL_CTRL_CLKOUTDIV_MASK; if (clkoutdiv != 1) { dev_err(xvcu->dev, "clkoutdiv value is invalid\n"); return -EINVAL;