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

[mv-sheeva.git] / drivers / input / serio / pcips2.c

diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index ea5e3c6ddb627dfdff7aa159dd0454a1caeb3a9c..1dacbe0d934832e54cae29353fd258e9a24bb339 100644 (file)
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -140,22 +140,20 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i
        if (ret)
                goto disable;
 
-       ps2if = kmalloc(sizeof(struct pcips2_data), GFP_KERNEL);
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+       ps2if = kzalloc(sizeof(struct pcips2_data), GFP_KERNEL);
+       serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (!ps2if || !serio) {
                ret = -ENOMEM;
                goto release;
        }
 
-       memset(ps2if, 0, sizeof(struct pcips2_data));
-       memset(serio, 0, sizeof(struct serio));
 
        serio->id.type          = SERIO_8042;
        serio->write            = pcips2_write;
        serio->open             = pcips2_open;
        serio->close            = pcips2_close;
        strlcpy(serio->name, pci_name(dev), sizeof(serio->name));
-       strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys));
+       strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys));
        serio->port_data        = ps2if;
        serio->dev.parent       = &dev->dev;
        ps2if->io               = serio;