Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28621
b: refs/heads/master
c: 568825c
h: refs/heads/master
i:
  28619: ed0bbf4
v: v3
  • Loading branch information
Jean Delvare authored and Greg Kroah-Hartman committed Jun 22, 2006
1 parent f0a9c47 commit 8884048
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 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: 59ac83677f72ea2cc25b5426e7df9589aa7a5384
refs/heads/master: 568825c8ed3c902981ce908ed5693abb3c9ddf59
15 changes: 7 additions & 8 deletions trunk/drivers/hwmon/f71805f.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ superio_exit(int base)
#define ADDR_REG_OFFSET 0
#define DATA_REG_OFFSET 1

static struct resource f71805f_resource __initdata = {
.flags = IORESOURCE_IO,
};

/*
* Registers
*/
Expand Down Expand Up @@ -782,6 +778,11 @@ static struct platform_driver f71805f_driver = {

static int __init f71805f_device_add(unsigned short address)
{
struct resource res = {
.start = address,
.end = address + REGION_LENGTH - 1,
.flags = IORESOURCE_IO,
};
int err;

pdev = platform_device_alloc(DRVNAME, address);
Expand All @@ -791,10 +792,8 @@ static int __init f71805f_device_add(unsigned short address)
goto exit;
}

f71805f_resource.start = address;
f71805f_resource.end = address + REGION_LENGTH - 1;
f71805f_resource.name = pdev->name;
err = platform_device_add_resources(pdev, &f71805f_resource, 1);
res.name = pdev->name;
err = platform_device_add_resources(pdev, &res, 1);
if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed "
"(%d)\n", err);
Expand Down

0 comments on commit 8884048

Please sign in to comment.