From patchwork Tue Jul 20 15:30:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 59335 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 674EAB70A6 for ; Wed, 21 Jul 2010 01:31:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932476Ab0GTPaq (ORCPT ); Tue, 20 Jul 2010 11:30:46 -0400 Received: from cantor.suse.de ([195.135.220.2]:34549 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932355Ab0GTPap (ORCPT ); Tue, 20 Jul 2010 11:30:45 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id DC06394430; Tue, 20 Jul 2010 17:30:44 +0200 (CEST) From: Jean Delvare Organization: Suse Linux To: "David S. Miller" Subject: [PATCH] e1000e: Drop a useless statement Date: Tue, 20 Jul 2010 17:30:42 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.32.13-0.4-pae; KDE/4.3.5; i686; ; ) Cc: netdev@vger.kernel.org, Auke Kok , Bruce Allan , Jesse Brandeburg MIME-Version: 1.0 Message-Id: <201007201730.42852.jdelvare@suse.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org err is set again a few lines below. Signed-off-by: Jean Delvare Cc: Auke Kok Cc: Bruce Allan Cc: Jesse Brandeburg --- I sent this patch to the e1000-devel list on June 8th, 2010, but didn't receive any answer: http://sourceforge.net/mailarchive/forum.php?thread_name=201006081820.25381.jdelvare%40suse.de&forum_name=e1000-devel drivers/net/e1000e/netdev.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -5557,8 +5557,6 @@ static int __devinit e1000_probe(struct if (err) goto err_sw_init; - err = -EIO; - memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops)); memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops)); memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));