Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

[linux-2.6-omap-h63xx.git] / drivers / hwmon / sis5595.c

diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 8610bce08244d1bb3f74dcca18ef48112c717073..9c6cadec1087131d17d2a5a256c9959f503a56a2 100644 (file)
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -518,11 +518,10 @@ static int sis5595_detect(struct i2c_adapter *adapter)
                        goto exit_release;
        }
 
-       if (!(data = kmalloc(sizeof(struct sis5595_data), GFP_KERNEL))) {
+       if (!(data = kzalloc(sizeof(struct sis5595_data), GFP_KERNEL))) {
                err = -ENOMEM;
                goto exit_release;
        }
-       memset(data, 0, sizeof(struct sis5595_data));
 
        new_client = &data->client;
        new_client->addr = address;
@@ -758,11 +757,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
                return -ENODEV;
        }
 
-       if (!address) {
-               dev_err(&dev->dev,"No SiS 5595 sensors found.\n");
-               return -ENODEV;
-       }
-
        s_bridge = pci_dev_get(dev);
        if (i2c_isa_add_driver(&sis5595_driver)) {
                pci_dev_put(s_bridge);