V4L/DVB (3500): Ringbuffer: don't reset pointers to zero

[linux-2.6] / drivers / hwmon / pc87360.c

diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index cf2a35799c7ce5939744ba91adf5b23a24a9289e..f161e88e3bb67db35cc0bcf2fd88fadf89c6044a 100644 (file)
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -236,8 +236,9 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
  */
 
 static struct i2c_driver pc87360_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "pc87360",
+       .driver = {
+               .name   = "pc87360",
+       },
        .attach_adapter = pc87360_detect,
        .detach_client  = pc87360_detach_client,
 };
@@ -754,9 +755,8 @@ static int pc87360_detect(struct i2c_adapter *adapter)
        const char *name = "pc87360";
        int use_thermistors = 0;
 
-       if (!(data = kmalloc(sizeof(struct pc87360_data), GFP_KERNEL)))
+       if (!(data = kzalloc(sizeof(struct pc87360_data), GFP_KERNEL)))
                return -ENOMEM;
-       memset(data, 0x00, sizeof(struct pc87360_data));
 
        new_client = &data->client;
        i2c_set_clientdata(new_client, data);
@@ -799,7 +799,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
        for (i = 0; i < 3; i++) {
                if (((data->address[i] = extra_isa[i]))
                 && !request_region(extra_isa[i], PC87360_EXTENT,
-                                   pc87360_driver.name)) {
+                                   pc87360_driver.driver.name)) {
                        dev_err(&new_client->dev, "Region 0x%x-0x%x already "
                                "in use!\n", extra_isa[i],
                                extra_isa[i]+PC87360_EXTENT-1);