diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/hwmon/vt1211.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
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) { |