Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227757
b: refs/heads/master
c: 774f782
h: refs/heads/master
i:
  227755: d05256f
v: v3
  • Loading branch information
Joe Perches authored and Guenter Roeck committed Jan 8, 2011
1 parent feebb1f commit d4934cc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: edb8d53c684da4062ac8c461727ddc1839336aa5
refs/heads/master: 774f7827e13cfae720306ca44b83b93ab2a6b9be
10 changes: 5 additions & 5 deletions trunk/drivers/hwmon/via686a.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
Warning - only supports a single device.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/slab.h>
#include <linux/pci.h>
Expand Down Expand Up @@ -791,21 +793,19 @@ static int __devinit via686a_device_add(unsigned short address)
pdev = platform_device_alloc("via686a", address);
if (!pdev) {
err = -ENOMEM;
printk(KERN_ERR "via686a: Device allocation failed\n");
pr_err("Device allocation failed\n");
goto exit;
}

err = platform_device_add_resources(pdev, &res, 1);
if (err) {
printk(KERN_ERR "via686a: Device resource addition failed "
"(%d)\n", err);
pr_err("Device resource addition failed (%d)\n", err);
goto exit_device_put;
}

err = platform_device_add(pdev);
if (err) {
printk(KERN_ERR "via686a: Device addition failed (%d)\n",
err);
pr_err("Device addition failed (%d)\n", err);
goto exit_device_put;
}

Expand Down

0 comments on commit d4934cc

Please sign in to comment.