From patchwork Sun Nov 23 20:22:22 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jirka Pirko X-Patchwork-Id: 10333 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 381E4DDDF0 for ; Mon, 24 Nov 2008 07:22:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752668AbYKWUWc (ORCPT ); Sun, 23 Nov 2008 15:22:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752547AbYKWUWb (ORCPT ); Sun, 23 Nov 2008 15:22:31 -0500 Received: from onyx.pirko.cz ([84.16.102.30]:57260 "EHLO onyx.pirko.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811AbYKWUWb (ORCPT ); Sun, 23 Nov 2008 15:22:31 -0500 Received: from localhost (localhost [127.0.0.1]) by onyx.pirko.cz (Postfix) with ESMTP id 632401B4C51B; Sun, 23 Nov 2008 21:22:06 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at onyx.pirko.cz Received: from onyx.pirko.cz ([127.0.0.1]) by localhost (onyx.pirko.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xrdrNJLVQCCs; Sun, 23 Nov 2008 21:22:00 +0100 (CET) Received: from jirka.pirko.cz (jirka.pirko.cz [84.16.102.26]) by onyx.pirko.cz (Postfix) with ESMTP id 987A61B4C50A; Sun, 23 Nov 2008 21:22:00 +0100 (CET) Date: Sun, 23 Nov 2008 21:22:22 +0100 From: Jirka Pirko To: linux-kernel@vger.kernel.org Cc: jgarzik@pobox.com, netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH] tokenring/3c359.c: Fix error message when allocating tx_ring Message-ID: <20081123212222.45121ffe@jirka.pirko.cz> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.9; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Pointed out by Joe Perches. Error message after tx_ring allocation check was wrong. Signed-off-by: Jirka Pirko --- drivers/net/tokenring/3c359.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index f832f9b..46fb308 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c @@ -638,7 +638,7 @@ static int xl_open(struct net_device *dev) /* These MUST be on 8 byte boundaries */ xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL); if (xl_priv->xl_tx_ring == NULL) { - printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", + printk(KERN_WARNING "%s: Not enough memory to allocate tx buffers.\n", dev->name); free_irq(dev->irq,dev); return -ENOMEM;