X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fsmc91x.c;h=cebabd49e5a4f00016c3be321338ed912e6b335f;hb=b6645c35843b9608bed8c2981fc53b942758853f;hp=2040965d7724bc29fd0cc92532ca9e65dded071c;hpb=26dcce0fabbef75ae426461edf21b5030bad60f3;p=pandora-kernel.git

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 2040965d7724..cebabd49e5a4 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -448,6 +448,11 @@ static inline void  smc_rcv(struct net_device *dev)
 		dev->name, packet_number, status,
 		packet_len, packet_len);
 
+	if (unlikely(packet_len == 0 && !(status & RS_ERRORS))) {
+		printk(KERN_ERR "%s: bad memory timings: rxlen %u status %x\n",
+			dev->name, packet_len, status);
+		status |= RS_TOOSHORT;
+	}
 	back:
 	if (unlikely(packet_len < 6 || status & RS_ERRORS)) {
 		if (status & RS_TOOLONG && packet_len <= (1514 + 4 + 6)) {
@@ -2255,7 +2260,7 @@ static int smc_drv_remove(struct platform_device *pdev)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
 	if (!res)
-		platform_get_resource(pdev, IORESOURCE_MEM, 0);
+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	release_mem_region(res->start, SMC_IO_EXTENT);
 
 	free_netdev(ndev);