From patchwork Wed Mar 7 06:18:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 882427 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="c1S0Xtef"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zx3Nv065yz9sfg for ; Wed, 7 Mar 2018 17:18:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751023AbeCGGSV (ORCPT ); Wed, 7 Mar 2018 01:18:21 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:51832 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbeCGGSU (ORCPT ); Wed, 7 Mar 2018 01:18:20 -0500 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 w276Gu7Y003139; Wed, 7 Mar 2018 06:18:17 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=qNJr58ZR7RXwvGibAjuydpywmzlTjC67NDIUbb+PabQ=; b=c1S0Xtef9ema7LFEuG8B3axHwPCNHD6SmCTeHNhTKZnnISeMXdZFoGyevjRW4OEIn228 RdrsVydcb8enk0z+U1qDrifTT+8FI2RF01BMWyBrK1hVtc6u96ZC3V0bXRbZC8uS8bO9 XwZrej1NoIdZkhvSfzNAAbsP8AUlI3+n+fXYp4l4zdTvJ6ikmYPjoq3RTSrv8LiRy/Oo cLG3N5yxAQgf2b95iDANH+8GxJkfDRjOFCD9VY69EQ1hqJWxTMCl1K5gq1+f6fbFwALg i+EQKc1xtNVE9Kn/NX8UGR7VNcBp0DIt7HxuXvnJ2h/LrPu96KBcBGszFvkz4g8UYaNs 9A== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2130.oracle.com with ESMTP id 2gj9b9r98w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Mar 2018 06:18:17 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w276IGiu006904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Mar 2018 06:18:16 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 w276IFQD014435; Wed, 7 Mar 2018 06:18:16 GMT Received: from mwanda (/197.254.35.146) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Mar 2018 22:18:15 -0800 Date: Wed, 7 Mar 2018 09:18:08 +0300 From: Dan Carpenter To: Rob Herring , Frank Rowand Cc: devicetree@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] of: unittest: fix an error test in of_unittest_overlay_8() Message-ID: <20180307061808.GA15765@mwanda> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.3 (2018-01-21) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8824 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=995 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803070074 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org We changed this from of_overlay_apply() to overlay_data_apply(). The overlay_data_apply() function returns 1 on success and 0 on error so the check for less than zero needs to be updated. Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT") Signed-off-by: Dan Carpenter Reviewed-by: Frank Rowand Reviewed-by: Frank Rowand --- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index ca5e86dadae2..b233f170b2ec 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1666,8 +1666,7 @@ static void __init of_unittest_overlay_8(void) overlay_name = overlay_name_from_nr(overlay_nr + i); - ret = overlay_data_apply(overlay_name, &ovcs_id); - if (ret < 0) { + if (!overlay_data_apply(overlay_name, &ovcs_id)) { unittest(0, "could not apply overlay \"%s\"\n", overlay_name); return;