summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorShubhrajyoti Datta <shubhrajyoti@ti.com>2011-03-23 00:33:57 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 01:44:10 +0100
commit45bff2ea4285cac5b4438c65216e114d3619f123 (patch)
tree5e835484c87156feeb51bb50887156e2d9635e72 /drivers/misc
parentbh1780gli: convert to dev pm ops (diff)
downloadlinux-45bff2ea4285cac5b4438c65216e114d3619f123.tar.xz
linux-45bff2ea4285cac5b4438c65216e114d3619f123.zip
drivers/misc/bmp085.c: free initmem memory
Free the memory that is used only at init Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/bmp085.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index b6e1c9a6679e..ecd276ad6b19 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -402,7 +402,7 @@ exit:
return status;
}
-static int bmp085_probe(struct i2c_client *client,
+static int __devinit bmp085_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct bmp085_data *data;
@@ -438,7 +438,7 @@ exit:
return err;
}
-static int bmp085_remove(struct i2c_client *client)
+static int __devexit bmp085_remove(struct i2c_client *client)
{
sysfs_remove_group(&client->dev.kobj, &bmp085_attr_group);
kfree(i2c_get_clientdata(client));
@@ -458,7 +458,7 @@ static struct i2c_driver bmp085_driver = {
},
.id_table = bmp085_id,
.probe = bmp085_probe,
- .remove = bmp085_remove,
+ .remove = __devexit_p(bmp085_remove),
.detect = bmp085_detect,
.address_list = normal_i2c