From patchwork Tue May 7 12:16:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 242189 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 336E92C019B for ; Tue, 7 May 2013 22:16:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757920Ab3EGMQD (ORCPT ); Tue, 7 May 2013 08:16:03 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:47222 "EHLO mail-bk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757143Ab3EGMQB (ORCPT ); Tue, 7 May 2013 08:16:01 -0400 Received: by mail-bk0-f45.google.com with SMTP id je9so249171bkc.32 for ; Tue, 07 May 2013 05:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=fFtpv7/1Yz4Ssy8zDvu2t+Sa+e3/vzpz2zPFffYe32w=; b=G1jAyF62yYU7Dqy2EItZPkHrJUb3XkhBuJCUeaJJZ3CgxzCeip5LYTNELVKnQnA3I5 xQZkxviyt3gV6psUEM202lEpS7ZpYVxNISxme45v/jBDSOm1OxEl7P1ZAMXSHFhXYjVg x9CdrX04I4AW9RvhHDPyN7XyWsk7CK4gV+hX+HK0lYTE+dh/pBygZ4W3gLgGUJbHdA/Q YJIO00G2heH5yC3b6bUcgqQJejbgaG4MgKDFVYw0mAhKUhE5IhwIHRl+jAUL2VLDmhM6 AqPkG3xxn/+lf2hFr9vOOz0yrFwVeabBxpOrepviJs+3P3ZIF0ryeHQF77pH52/WfHsR 5hQw== MIME-Version: 1.0 X-Received: by 10.204.62.137 with SMTP id x9mr497193bkh.90.1367928960071; Tue, 07 May 2013 05:16:00 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Tue, 7 May 2013 05:16:00 -0700 (PDT) Date: Tue, 7 May 2013 20:16:00 +0800 Message-ID: Subject: [PATCH] net/spider_net: fix error return code in spider_net_open() From: Wei Yongjun To: kou.ishizaki@toshiba.co.jp, jens@de.ibm.com, grant.likely@linaro.org, rob.herring@calxeda.com Cc: yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- drivers/net/ethernet/toshiba/spider_net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" 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/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index c655fe6..5734480 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c @@ -1990,7 +1990,8 @@ spider_net_open(struct net_device *netdev) goto alloc_rx_failed; /* Allocate rx skbs */ - if (spider_net_alloc_rx_skbs(card)) + result = spider_net_alloc_rx_skbs(card); + if (result) goto alloc_skbs_failed; spider_net_set_multi(netdev);