From: Don Fry Date: Thu, 25 May 2006 23:22:40 +0000 (-0700) Subject: [PATCH] pcnet32: remove incorrect pcnet32_free_ring X-Git-Tag: v2.6.17-rc6~102 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a24b163b7c16f9e30e726319115e45ed6e683582;p=linux-2.6 [PATCH] pcnet32: remove incorrect pcnet32_free_ring During a code scan for another change I discovered that this call to pcnet32_free_ring must be removed. If the open fails due to a lack of memory all the ring structures are removed via the call to free_ring and a subsequent call to open will dereference a null pointer in pcnet32_init_ring. Please apply to 2.6.17. Signed-off-by: Don Fry Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 07c31f19c6..fc08c4af50 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c @@ -1774,8 +1774,6 @@ static int pcnet32_open(struct net_device *dev) lp->rx_dma_addr[i] = 0; } - pcnet32_free_ring(dev); - /* * Switch back to 16bit mode to avoid problems with dumb * DOS packet driver after a warm reboot