From patchwork Fri Nov 21 14:09:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 413066 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 E5FF1140180 for ; Sat, 22 Nov 2014 01:09:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758464AbaKUOJx (ORCPT ); Fri, 21 Nov 2014 09:09:53 -0500 Received: from eddie.linux-mips.org ([148.251.95.138]:59728 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758457AbaKUOJw (ORCPT ); Fri, 21 Nov 2014 09:09:52 -0500 Received: from localhost.localdomain ([127.0.0.1]:49956 "EHLO localhost.localdomain" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27006519AbaKUOJwEoAe0 (ORCPT ); Fri, 21 Nov 2014 15:09:52 +0100 Date: Fri, 21 Nov 2014 14:09:52 +0000 (GMT) From: "Maciej W. Rozycki" To: netdev@vger.kernel.org Subject: [PATCH 1/4] defxx: Fix DEFPA enable error propagation In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LFD 23 2013-08-11) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Correctly propagate the error code from `pci_enable_device' if non zero. Currently a failure of this function is correctly recognized and device initialization abandoned, however a successful completion code returned. Signed-off-by: Maciej W. Rozycki --- linux-defpa-enable-err.patch -- 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 Index: linux-20141025-dolch/drivers/net/fddi/defxx.c =================================================================== --- linux-20141025-dolch.orig/drivers/net/fddi/defxx.c +++ linux-20141025-dolch/drivers/net/fddi/defxx.c @@ -542,10 +542,13 @@ static int dfx_register(struct device *b } /* Enable PCI device. */ - if (dfx_bus_pci && pci_enable_device(to_pci_dev(bdev))) { - printk(KERN_ERR "%s: Cannot enable PCI device, aborting\n", - print_name); - goto err_out; + if (dfx_bus_pci) { + err = pci_enable_device(to_pci_dev(bdev)); + if (err) { + pr_err("%s: Cannot enable PCI device, aborting\n", + print_name); + goto err_out; + } } SET_NETDEV_DEV(dev, bdev);