From 63174e4954f5b11ace506389b3962b51a3264540 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Mon, 21 Sep 2009 17:04:48 -0700
Subject: [PATCH] --- yaml --- r: 164543 b: refs/heads/master c:
 560a64a2b501add585b494b2b9cd9f68c0636b50 h: refs/heads/master i:   164541:
 7ceb0d78bf7d3cb343e49fc8d6978afaad604a4b   164539:
 66fbe921cbde5f5d6e4e591b999c904126b3e946   164535:
 e0e4d9938fc44f195380e1f4c6cf78da45b5ce1c   164527:
 dccd78603af71c403c6b15ca85688d2fc76cd77f   164511:
 b321f4b5433dcefcfdd8e759b25e88e7c989124d   164479:
 59b3f1626352ff811d66bb3385b2a886c0762ddc v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/hwmon/sht15.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7573bebc42b0..2a782a8879df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 905ffdc35e50844ab45bbc59d5302238844f8526
+refs/heads/master: 560a64a2b501add585b494b2b9cd9f68c0636b50
diff --git a/trunk/drivers/hwmon/sht15.c b/trunk/drivers/hwmon/sht15.c
index 6290a259456e..303c02694c3c 100644
--- a/trunk/drivers/hwmon/sht15.c
+++ b/trunk/drivers/hwmon/sht15.c
@@ -562,7 +562,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
 	ret = sysfs_create_group(&pdev->dev.kobj, &sht15_attr_group);
 	if (ret) {
 		dev_err(&pdev->dev, "sysfs create failed");
-		goto err_free_data;
+		goto err_release_gpio_data;
 	}
 
 	ret = request_irq(gpio_to_irq(data->pdata->gpio_data),
@@ -581,10 +581,12 @@ static int __devinit sht15_probe(struct platform_device *pdev)
 	data->hwmon_dev = hwmon_device_register(data->dev);
 	if (IS_ERR(data->hwmon_dev)) {
 		ret = PTR_ERR(data->hwmon_dev);
-		goto err_release_gpio_data;
+		goto err_release_irq;
 	}
 	return 0;
 
+err_release_irq:
+	free_irq(gpio_to_irq(data->pdata->gpio_data), data);
 err_release_gpio_data:
 	gpio_free(data->pdata->gpio_data);
 err_release_gpio_sck: