Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264125
b: refs/heads/master
c: b3a242a
h: refs/heads/master
i:
  264123: 0fde02b
v: v3
  • Loading branch information
Jan Beulich authored and Guenter Roeck committed Sep 23, 2011
1 parent 01481ba commit 1df7156
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: cc41d586e8b4d76164fe7731c1c49be6cc5fc7e6
refs/heads/master: b3a242a6e4b8c09dbb466ab7a9d2c724e75faa67
4 changes: 2 additions & 2 deletions trunk/drivers/hwmon/coretemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
if (err)
goto exit_free;

pdata->phys_proc_id = TO_PHYS_ID(pdev->id);
pdata->phys_proc_id = pdev->id;
platform_set_drvdata(pdev, pdata);

pdata->hwmon_dev = hwmon_device_register(&pdev->dev);
Expand Down Expand Up @@ -613,7 +613,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)

mutex_lock(&pdev_list_mutex);

pdev = platform_device_alloc(DRVNAME, cpu);
pdev = platform_device_alloc(DRVNAME, TO_PHYS_ID(cpu));
if (!pdev) {
err = -ENOMEM;
pr_err("Device allocation failed\n");
Expand Down

0 comments on commit 1df7156

Please sign in to comment.