From 2e852c3c2288e92ed0bc926c331035dc603d868e Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:57:57 -0700 Subject: [PATCH] --- yaml --- r: 326151 b: refs/heads/master c: a34c26d8e288d48e70c0e722da0c745e14d74e3a h: refs/heads/master i: 326149: 66fefe2a80426b185777884d74971f58641a2ff6 326147: 8792d8c2870c95e6fbcb0d3d89c890951a01d3a1 326143: 789f8720fc74c8e8d7bf101a5578e7b3b25b336c v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/abituguru3.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 30cc0ba0be43..f02e82a4e809 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8f30ad8e556cad5ee23fdb63845914aec4a8172 +refs/heads/master: a34c26d8e288d48e70c0e722da0c745e14d74e3a diff --git a/trunk/drivers/hwmon/abituguru3.c b/trunk/drivers/hwmon/abituguru3.c index 5d582aebff87..b174b8b2b4df 100644 --- a/trunk/drivers/hwmon/abituguru3.c +++ b/trunk/drivers/hwmon/abituguru3.c @@ -976,7 +976,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) u8 buf[2]; u16 id; - data = kzalloc(sizeof(struct abituguru3_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct abituguru3_data), + GFP_KERNEL); if (!data) return -ENOMEM; @@ -1068,7 +1069,6 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(abituguru3_sysfs_attr); i++) device_remove_file(&pdev->dev, &abituguru3_sysfs_attr[i].dev_attr); - kfree(data); return res; } @@ -1084,8 +1084,6 @@ static int __devexit abituguru3_remove(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(abituguru3_sysfs_attr); i++) device_remove_file(&pdev->dev, &abituguru3_sysfs_attr[i].dev_attr); - kfree(data); - return 0; }