From patchwork Wed Aug 24 13:47:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 662294 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sK7w94Vf4z9stY for ; Wed, 24 Aug 2016 23:49:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=NMo93HtK; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sK7w93L1WzDrJy for ; Wed, 24 Aug 2016 23:49:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=NMo93HtK; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sK7td35r5zDrJy for ; Wed, 24 Aug 2016 23:48:25 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=NMo93HtK; dkim-atps=neutral Received: by mail-pf0-x243.google.com with SMTP id y134so1281583pfg.3 for ; Wed, 24 Aug 2016 06:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sBdDe7OEOZ3soYJsFMWZnNaPDFhhCbZt73H6mFW+U3g=; b=NMo93HtKbUpnvaPN5DdhsCPKFBJosbUbRwLHVjsOAK3OSKq+upc1KR/q8V/jwZJ7eH 28Ebp5tm6WNBB9RdGZIItABKC9AFVQXb7Y9rauODdXmkipkiNwxQll8ZH4MzFJxoNsNY Ze/SRqND0KkV+dCi6OxtDjQgMQ34A+DWASNyIgL7WOrIAAZsaQJ0Vd/FtX6AZqNP/+yQ jOerTjg4fk4TIlZv9B/HZssOAjNhLPWByvzbKFQw5C+A0AyvJwGdKipu6FfVLI6qAOfS o19sDA4mxtqW9bLwhS4ASzpMRcQDRB7eyhKYRdWglB++yTSQnMPJ12NtcN7wOb6s3NBO KcjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sBdDe7OEOZ3soYJsFMWZnNaPDFhhCbZt73H6mFW+U3g=; b=ZJ2Vz3jGL43DMAjxlYBIbQKFWqkQqdx2gca+onokhnSsYpf5KsN4zSMeQ/ZCLDkUmB 1ZAuN0Adv5RHGx2fFVXZYLo/6IT0wUzdTwYH880pWBFOcfhMUQWsKN+MNkycCw+yO5x8 aLhhbV1bqtHM/lsYfSvCaxftwqSzlgRo8VQkx9gwgHgppzSeavol7uK3NeT7Q+1c3CDr 5h4AG8V9j6IUXQBs8gfDXgCqlKtI76KCsyw4wT7HkOVvc+cyA4MHFVy8pB/QhnBS0uAs tKManlOjyOfCM4AMj25lInldD9EQm8e1OukI5vW9EPF0XZ+YDY/cNCHVaF5U+Ye1o9Gj lk2Q== X-Gm-Message-State: AE9vXwOA+fSOp8V4wwx/JQkSGlU79VnwaVjTyN5mX8x+NOADKpqoBEmzu0DBw9szYkB0vw== X-Received: by 10.98.57.90 with SMTP id g87mr5878510pfa.106.1472046503601; Wed, 24 Aug 2016 06:48:23 -0700 (PDT) Received: from localhost.localdomain.localdomain (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id a21sm13941586pfe.81.2016.08.24.06.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 06:48:23 -0700 (PDT) From: Wei Yongjun To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Thomas Falcon , John Allen Subject: [PATCH -next] ibmvnic: fix error return code in ibmvnic_probe() Date: Wed, 24 Aug 2016 13:47:58 +0000 Message-Id: <1472046478-1427-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Wei Yongjun , netdev@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wei Yongjun Fix to return error code -ENOMEM from the dma_map_single error handling case instead of 0, as done elsewhere in this function. Fixes: 032c5e82847a ("Driver for IBM System i/p VNIC protocol") Signed-off-by: Wei Yongjun --- drivers/net/ethernet/ibm/ibmvnic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index b942108..59245d0 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -3751,6 +3751,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) if (dma_mapping_error(&dev->dev, adapter->stats_token)) { if (!firmware_has_feature(FW_FEATURE_CMO)) dev_err(&dev->dev, "Couldn't map stats buffer\n"); + rc = -ENOMEM; goto free_crq; }