Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / drivers / net / ksz884x.c

diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index cc0bc8a..c80ca64 100644 (file)
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -7049,10 +7049,9 @@ static int __init pcidev_init(struct pci_dev *pdev,
                        mib_port_count = SWITCH_PORT_NUM;
                }
                hw->mib_port_cnt = TOTAL_PORT_NUM;
-               hw->ksz_switch = kmalloc(sizeof(struct ksz_switch), GFP_KERNEL);
+               hw->ksz_switch = kzalloc(sizeof(struct ksz_switch), GFP_KERNEL);
                if (!hw->ksz_switch)
                        goto pcidev_init_alloc_err;
-               memset(hw->ksz_switch, 0, sizeof(struct ksz_switch));
 
                sw = hw->ksz_switch;
        }