diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:49:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:49:55 -0500 |
| commit | 467388f29fc9cebfb70e7a187107b6b5d772cb44 (patch) | |
| tree | 4e6fffa65f38addffc149a5fe88be3d2161eaf6e /drivers/hwmon/vt1211.c | |
| parent | 028e1415a78733fcd2cba4b4c001826cc37a373e (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/hwmon/vt1211.c')
| -rw-r--r-- | drivers/hwmon/vt1211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index b0ce37852281..73f77a9b8b18 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c | |||
| @@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsigned short address) | |||
| 1262 | res.name = pdev->name; | 1262 | res.name = pdev->name; |
| 1263 | err = acpi_check_resource_conflict(&res); | 1263 | err = acpi_check_resource_conflict(&res); |
| 1264 | if (err) | 1264 | if (err) |
| 1265 | goto EXIT; | 1265 | goto EXIT_DEV_PUT; |
| 1266 | 1266 | ||
| 1267 | err = platform_device_add_resources(pdev, &res, 1); | 1267 | err = platform_device_add_resources(pdev, &res, 1); |
| 1268 | if (err) { | 1268 | if (err) { |