Changeset 2445 for lm-sensors/trunk/kernel/chips/adm1026.c

Timestamp:

04/17/04 19:20:01 (9 years ago)

Author:

khali

Message:

Backport memory allocation reworking from Linux 2.6.

Files:

• lm-sensors/trunk/kernel/chips/adm1026.c (modified) (4 diffs)

lm-sensors/trunk/kernel/chips/adm1026.c

@@ -299 +299 @@
 
 struct adm1026_data {
+        struct i2c_client client;
         struct semaphore lock;
         int sysctl_id;
@@ -638 +639 @@
            But it allows us to access adm1026_{read,write}_value. */
 
-        if (!(new_client = kmalloc((sizeof(struct i2c_client)) +
-                                   sizeof(struct adm1026_data),
-                                   GFP_KERNEL))) {
+        if (!(data = kmalloc(sizeof(struct adm1026_data), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto ERROR0;
         }
 
-        data = (struct adm1026_data *) (new_client + 1);
+        new_client = &data->client;
         new_client->addr = address;
         new_client->data = data;
@@ -768 +767 @@
         i2c_detach_client(new_client);
     ERROR1:
-        kfree(new_client);
+        kfree(data);
     ERROR0:
         return err;
@@ -787 +786 @@
         }
 
-        kfree(client);
+        kfree(client->data);
 
         return 0;