Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 22:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfd: 88pm860x: Convert to managed resources for allocating memory

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Lee Jones 2013-05-23 16:25:03 +01:00 committed by Samuel Ortiz
parent 02c7d84894
commit a1ace0aac5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/88pm860x-core.c
View File

@ -1150,7 +1150,8 @@ static int pm860x_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev,
sizeof(struct pm860x_chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
@ -1160,7 +1161,6 @@ static int pm860x_probe(struct i2c_client *client,
ret = PTR_ERR(chip->regmap); ret = PTR_ERR(chip->regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n", dev_err(&client->dev, "Failed to allocate register map: %d\n",
ret); ret);
kfree(chip);
return ret; return ret;
} }
chip->client = client; chip->client = client;
@ -1203,7 +1203,6 @@ static int pm860x_remove(struct i2c_client *client)
regmap_exit(chip->regmap_companion); regmap_exit(chip->regmap_companion);
i2c_unregister_device(chip->companion); i2c_unregister_device(chip->companion);
} }
kfree(chip);
return 0; return 0;
} }