diff -Naur c/drivers/hwmon/w83792d.c d/drivers/hwmon/w83792d.c
--- c/drivers/hwmon/w83792d.c	2005-07-15 13:17:57.829231000 +0200
+++ d/drivers/hwmon/w83792d.c	2005-07-17 17:00:55.699606750 +0200
@@ -1078,6 +1078,35 @@
 }
 
 
+static int 
+w83792d_create_subclient(struct i2c_adapter *adapter,
+				struct i2c_client *new_client, int addr,
+				struct i2c_client **sub_cli) 
+{
+	int err;
+	struct i2c_client *sub_client;
+	
+	(*sub_cli) = sub_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+	if (!(sub_client)) {
+		return -ENOMEM;
+	}
+	memset(sub_client, 0x00, sizeof(struct i2c_client));
+	sub_client->addr = 0x48 + addr;
+	i2c_set_clientdata(sub_client, NULL);
+	sub_client->adapter = adapter;
+	sub_client->driver = &w83792d_driver;
+	sub_client->flags = 0;
+	strlcpy(sub_client->name, "w83792d subclient", I2C_NAME_SIZE);
+	if ((err = i2c_attach_client(sub_client))) {
+		dev_err(&new_client->dev, "subclient registration "
+			"at address 0x%x failed\n", sub_client->addr);
+		kfree(sub_client);
+		return err;
+	}
+	return 0;
+}
+
+
 static int
 w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 		struct i2c_client *new_client)
@@ -1085,23 +1114,8 @@
 	int i, id, err;
 	u8 val;
 	struct w83792d_data *data = i2c_get_clientdata(new_client);
-
-	data->lm75[0] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-	if (!(data->lm75[0])) {
-		err = -ENOMEM;
-		goto ERROR_SC_0;
-	}
-	memset(data->lm75[0], 0x00, sizeof(struct i2c_client));
-
-	data->lm75[1] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-	if (!(data->lm75[1])) {
-		err = -ENOMEM;
-		goto ERROR_SC_1;
-	}
-	memset(data->lm75[1], 0x00, sizeof(struct i2c_client));
-
+	
 	id = i2c_adapter_id(adapter);
-
 	if (force_subclients[0] == id && force_subclients[1] == address) {
 		for (i = 2; i <= 3; i++) {
 			if (force_subclients[i] < 0x48 ||
@@ -1110,56 +1124,44 @@
 					"address %d; must be 0x48-0x4f\n",
 					force_subclients[i]);
 				err = -ENODEV;
-				goto ERROR_SC_2;
+				goto ERROR_SC_0;
 			}
 		}
 		w83792d_write_value(new_client, W83792D_REG_I2C_SUBADDR,
-					(force_subclients[2] & 0x03) |
-					((force_subclients[3] & 0x03) <<4));
-		data->lm75[0]->addr = force_subclients[2];
-		data->lm75[1]->addr = force_subclients[3];
-	} else {
-		val = w83792d_read_value(new_client, W83792D_REG_I2C_SUBADDR);
-		data->lm75[0]->addr = 0x48 + (val & 0x07);
-		data->lm75[1]->addr = 0x48 + ((val >> 4) & 0x07);
-	}
-
-	if (data->lm75[0]->addr == data->lm75[1]->addr) {
-		dev_err(&new_client->dev, "duplicate addresses 0x%x "
-				"for subclients\n", data->lm75[0]->addr);
-		err = -ENODEV;
-		goto ERROR_SC_2;
+					(force_subclients[2] & 0x07) |
+					((force_subclients[3] & 0x07) << 4));
 	}
 
-	for (i = 0; i <= 1; i++) {
-		i2c_set_clientdata(data->lm75[i], NULL);
-		data->lm75[i]->adapter = adapter;
-		data->lm75[i]->driver = &w83792d_driver;
-		data->lm75[i]->flags = 0;
-		strlcpy(data->lm75[i]->name, "w83792d subclient", I2C_NAME_SIZE);
-	}
-
-	if ((err = i2c_attach_client(data->lm75[0]))) {
-		dev_err(&new_client->dev, "subclient %d registration "
-			"at address 0x%x failed.\n", i, data->lm75[0]->addr);
-		goto ERROR_SC_2;
-	}
-
-	if ((err = i2c_attach_client(data->lm75[1]))) {
-		dev_err(&new_client->dev, "subclient %d registration "
-			"at address 0x%x failed.\n", i, data->lm75[1]->addr);
-		goto ERROR_SC_3;
+	val = w83792d_read_value(new_client, W83792D_REG_I2C_SUBADDR);
+	if (!(val & 0x08)) {
+		err = w83792d_create_subclient(adapter, new_client, val & 0x7,
+						&data->lm75[0]);
+		if (err < 0)
+			goto ERROR_SC_0;
+	}
+	if (!(val & 0x80)) {
+		if ((data->lm75[0] != NULL) && 
+			((val & 0x7) == ((val >> 4) & 0x7))) {
+			dev_err(&new_client->dev, "duplicate addresses 0x%x, "
+				"use force_subclient\n", data->lm75[0]->addr);
+			err = -ENODEV;
+			goto ERROR_SC_1;
+		}
+		err = w83792d_create_subclient(adapter, new_client,
+						(val >> 4) & 0x7, &data->lm75[1]);
+		if (err < 0)
+			goto ERROR_SC_1;
 	}
 
 	return 0;
 
 /* Undo inits in case of errors */
-ERROR_SC_3:
-	i2c_detach_client(data->lm75[0]);
-ERROR_SC_2:
-	kfree(data->lm75[1]);
+
 ERROR_SC_1:
-	kfree(data->lm75[0]);
+	if (data->lm75[0] != NULL) {
+		i2c_detach_client(data->lm75[0]);
+		kfree(data->lm75[0]);
+	}
 ERROR_SC_0:
 	return err;
 }