Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a24b163b authored by Don Fry's avatar Don Fry Committed by Jeff Garzik
Browse files

[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: default avatarDon Fry <brazilnut@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 80871e63
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -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