From patchwork Mon Dec 27 17:31:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 76797 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 26C93B6F1E for ; Tue, 28 Dec 2010 04:32:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753712Ab0L0Rbo (ORCPT ); Mon, 27 Dec 2010 12:31:44 -0500 Received: from cantor.suse.de ([195.135.220.2]:53265 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753552Ab0L0Rbn (ORCPT ); Mon, 27 Dec 2010 12:31:43 -0500 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 D60F790975; Mon, 27 Dec 2010 18:31:41 +0100 (CET) Received: by ds.suse.cz (Postfix, from userid 10065) id 17BDE74760; Mon, 27 Dec 2010 18:31:41 +0100 (CET) From: David Sterba To: mcarlson@broadcom.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Sterba , Michael Chan Subject: [PATCH] tg3: fix return value check in tg3_read_vpd() Date: Mon, 27 Dec 2010 18:31:34 +0100 Message-Id: <1293471094-28976-1-git-send-email-dsterba@suse.cz> X-Mailer: git-send-email 1.7.3.4.626.g73e7b Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org CC: Matt Carlson CC: Michael Chan Signed-off-by: David Sterba --- drivers/net/tg3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 30ccbb6..6f97b7b 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -12658,7 +12658,7 @@ static void __devinit tg3_read_vpd(struct tg3 *tp) cnt = pci_read_vpd(tp->pdev, pos, TG3_NVM_VPD_LEN - pos, &vpd_data[pos]); - if (cnt == -ETIMEDOUT || -EINTR) + if (cnt == -ETIMEDOUT || cnt == -EINTR) cnt = 0; else if (cnt < 0) goto out_not_found;