From patchwork Mon Dec 23 09:33:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Libin X-Patchwork-Id: 304736 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 D28442C0078 for ; Mon, 23 Dec 2013 20:34:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754635Ab3LWJeP (ORCPT ); Mon, 23 Dec 2013 04:34:15 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:11908 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751181Ab3LWJeO (ORCPT ); Mon, 23 Dec 2013 04:34:14 -0500 Received: from 172.24.2.119 (EHLO szxeml214-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BOX88110; Mon, 23 Dec 2013 17:33:56 +0800 (CST) Received: from SZXEML407-HUB.china.huawei.com (10.82.67.94) by szxeml214-edg.china.huawei.com (172.24.2.29) with Microsoft SMTP Server (TLS) id 14.3.158.1; Mon, 23 Dec 2013 17:33:56 +0800 Received: from localhost (10.135.74.57) by szxeml407-hub.china.huawei.com (10.82.67.94) with Microsoft SMTP Server id 14.3.158.1; Mon, 23 Dec 2013 17:33:48 +0800 From: Libin To: , , , CC: , , Subject: [PATCH] drivers/net: Fix potential incorrect call for udelay() Date: Mon, 23 Dec 2013 17:33:44 +0800 Message-ID: <1387791224-29320-1-git-send-email-huawei.libin@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.135.74.57] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li Bin The variable delay_time as a module parameter can be set a value exceeding the limit of the udelay function. This patch checks the delay_time value to select mdelay() or udelay(). Signed-off-by: Li Bin --- drivers/net/ethernet/8390/pcnet_cs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c index 46c5aad..29fe157 100644 --- a/drivers/net/ethernet/8390/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -1284,8 +1284,12 @@ static void dma_block_output(struct net_device *dev, int count, } outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ - if (info->flags & DELAY_OUTPUT) - udelay((long)delay_time); + if (info->flags & DELAY_OUTPUT) { + if (delay_time >= 1000) + mdelay((long)delay_time/1000); + else + udelay(delay_time); + } ei_status.dmaing &= ~0x01; }