patch-2.4.8 linux/drivers/net/tulip/tulip_core.c

Next file: linux/drivers/net/tun.c
Previous file: linux/drivers/net/tokenring/ibmtr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.7/linux/drivers/net/tulip/tulip_core.c linux/drivers/net/tulip/tulip_core.c
@@ -1420,6 +1420,10 @@
 	if (chip_idx == LC82C168)
 		csr0 &= ~0xfff10000; /* zero reserved bits 31:20, 16 */
 
+	/* DM9102A has troubles with MRM, clear bit 24 too. */
+	if (pdev->vendor == 0x1282 && pdev->device == 0x9102)
+		csr0 &= ~0x01200000;
+
 	/*
 	 *	And back to business
 	 */
@@ -1762,9 +1766,9 @@
 		kfree (tp->mtable);
 #ifndef USE_IO_OPS
 	iounmap((void *)ioaddr);
-#endif
 
 err_out_free_res:
+#endif
 	pci_release_regions (pdev);
 
 err_out_free_netdev:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)