From patchwork Wed Mar 14 20:08:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 886014 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="FEQwYosS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 401jTl0LGJz9sTV for ; Thu, 15 Mar 2018 07:08:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480AbeCNUIl (ORCPT ); Wed, 14 Mar 2018 16:08:41 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:35674 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751357AbeCNUIk (ORCPT ); Wed, 14 Mar 2018 16:08:40 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2EK7QFA094953; Wed, 14 Mar 2018 20:08:37 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=sRdDWuhDsWN1472L94tltpwRBtni98HCWOUqiNLrtug=; b=FEQwYosS2koBOH8gP7eA+ER7GhwnO/54rRMlG4DDiI0FoyLPDansge1EgyG5MV3B1LDU YOdxUHBnlHfprcYMcVWl8aZxLFrZ5qNJWiR2mc7HYsxqHOPCat/h5WhZWsYYUF9J5W57 Gxe2Laa9Zt+hKyAhDYyX7oNhTTuePH1WHG6JbDBzYWATPoplXnDKDbTQoVOHXo9ogY0S wIOdkaT7jSLAc63Rlm2FcYIA5A3vMfvBleUYzjDcyuEdhOBH/ZDdHDIgaNsr4nzTwkzW QwVBu0CA/JdHjT0Hl1hvgPKMM2uqDCTofAkH3xxDYAlH/sp+c3tYj9/WagCVqn0jPT+i ag== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2gq844rnj1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Mar 2018 20:08:37 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w2EK8aRM017187 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Mar 2018 20:08:37 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w2EK8axi015999; Wed, 14 Mar 2018 20:08:36 GMT Received: from mwanda (/197.254.35.146) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 14 Mar 2018 13:08:35 -0700 Date: Wed, 14 Mar 2018 23:08:28 +0300 From: Dan Carpenter To: Rob Herring , Frank Rowand Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] of: unittest: fix an error code in of_unittest_apply_overlay() Message-ID: <20180314200828.GA10588@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=8832 signatures=668690 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=862 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803140217 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org We accidentally return zero on failure instead of a negative error code. Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT") Signed-off-by: Dan Carpenter --- 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 dede77a79820..bc03902693b7 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1417,15 +1417,13 @@ static int __init of_unittest_apply_overlay(int overlay_nr, int unittest_nr, int *overlay_id) { const char *overlay_name; - int ret; overlay_name = overlay_name_from_nr(overlay_nr); - ret = overlay_data_apply(overlay_name, overlay_id); - if (!ret) { + if (!overlay_data_apply(overlay_name, overlay_id)) { unittest(0, "could not apply overlay \"%s\"\n", overlay_name); - return ret; + return -EFAULT; } of_unittest_track_overlay(*overlay_id);