1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 2d8e28819779..38492e0b704e 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1675,7 +1675,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                                 pr_cont(" warning: CSR address invalid,\n");
                                 pr_info("    using instead PROM address of");
                         }
-                        memcpy(dev->dev_addr, promaddr, 6);
+                        memcpy(dev->dev_addr, promaddr, ETH_ALEN);
                 }
         }
 
@@ -2818,7 +2818,6 @@ static void pcnet32_remove_one(struct pci_dev *pdev)
                                     lp->init_block, lp->init_dma_addr);
                 free_netdev(dev);
                 pci_disable_device(pdev);
-                pci_set_drvdata(pdev, NULL);
         }
 }