Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227742
b: refs/heads/master
c: 9c6e13b
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Guenter Roeck committed Jan 8, 2011
1 parent 4803bbe commit 1e366d3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: f8bb8925682f355dc20f721bda7021ef13e5869f
refs/heads/master: 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb
12 changes: 6 additions & 6 deletions trunk/drivers/hwmon/dme1737.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Expand Down Expand Up @@ -2446,7 +2448,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
/* Get the base address of the runtime registers */
if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) |
dme1737_sio_inb(sio_cip, 0x61))) {
printk(KERN_ERR "dme1737: Base address not set.\n");
pr_err("Base address not set\n");
err = -ENODEV;
goto exit;
}
Expand Down Expand Up @@ -2475,20 +2477,18 @@ static int __init dme1737_isa_device_add(unsigned short addr)
goto exit;

if (!(pdev = platform_device_alloc("dme1737", addr))) {
printk(KERN_ERR "dme1737: Failed to allocate device.\n");
pr_err("Failed to allocate device\n");
err = -ENOMEM;
goto exit;
}

if ((err = platform_device_add_resources(pdev, &res, 1))) {
printk(KERN_ERR "dme1737: Failed to add device resource "
"(err = %d).\n", err);
pr_err("Failed to add device resource (err = %d)\n", err);
goto exit_device_put;
}

if ((err = platform_device_add(pdev))) {
printk(KERN_ERR "dme1737: Failed to add device (err = %d).\n",
err);
pr_err("Failed to add device (err = %d)\n", err);
goto exit_device_put;
}

Expand Down

0 comments on commit 1e366d3

Please sign in to comment.