From 76271d088828cf16e40ad7aa12ab2196b3521976 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:58:08 -0700 Subject: [PATCH] --- yaml --- r: 326172 b: refs/heads/master c: 33ed6d4a82b7422a0ab2f97f19fc841670da99d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/lm70.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3e253c559c29..341a4992b7fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a81b0f73d10add406fca13c91c73e6a3cd505b46 +refs/heads/master: 33ed6d4a82b7422a0ab2f97f19fc841670da99d4 diff --git a/trunk/drivers/hwmon/lm70.c b/trunk/drivers/hwmon/lm70.c index 472f79521a96..dd7f0cafd197 100644 --- a/trunk/drivers/hwmon/lm70.c +++ b/trunk/drivers/hwmon/lm70.c @@ -149,7 +149,7 @@ static int __devinit lm70_probe(struct spi_device *spi) /* NOTE: we assume 8-bit words, and convert to 16 bits manually */ - p_lm70 = kzalloc(sizeof *p_lm70, GFP_KERNEL); + p_lm70 = devm_kzalloc(&spi->dev, sizeof(*p_lm70), GFP_KERNEL); if (!p_lm70) return -ENOMEM; @@ -181,7 +181,6 @@ static int __devinit lm70_probe(struct spi_device *spi) device_remove_file(&spi->dev, &dev_attr_temp1_input); out_dev_create_temp_file_failed: spi_set_drvdata(spi, NULL); - kfree(p_lm70); return status; } @@ -193,7 +192,6 @@ static int __devexit lm70_remove(struct spi_device *spi) device_remove_file(&spi->dev, &dev_attr_temp1_input); device_remove_file(&spi->dev, &dev_attr_name); spi_set_drvdata(spi, NULL); - kfree(p_lm70); return 0; }