Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207751
b: refs/heads/master
c: 1d90d2c
h: refs/heads/master
i:
  207749: c09a01f
  207747: 16b82de
  207743: 2d510f4
v: v3
  • Loading branch information
H Hartley Sweeten authored and David Woodhouse committed Aug 2, 2010
1 parent 43cfad4 commit a670b52
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 9938424f0c4d208883cbf32083ec2bfcc220f85b
refs/heads/master: 1d90d2c3d4ef8ba4f8e05b3578900397333b1bd1
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/maps/physmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ static int physmap_flash_probe(struct platform_device *dev)

for (i = 0; i < dev->num_resources; i++) {
printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",
(unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1),
(unsigned long long)resource_size(&dev->resource[i]),
(unsigned long long)dev->resource[i].start);

if (!devm_request_mem_region(&dev->dev,
dev->resource[i].start,
dev->resource[i].end - dev->resource[i].start + 1,
resource_size(&dev->resource[i]),
dev_name(&dev->dev))) {
dev_err(&dev->dev, "Could not reserve memory region\n");
err = -ENOMEM;
Expand All @@ -120,7 +120,7 @@ static int physmap_flash_probe(struct platform_device *dev)

info->map[i].name = dev_name(&dev->dev);
info->map[i].phys = dev->resource[i].start;
info->map[i].size = dev->resource[i].end - dev->resource[i].start + 1;
info->map[i].size = resource_size(&dev->resource[i]);
info->map[i].bankwidth = physmap_data->width;
info->map[i].set_vpp = physmap_data->set_vpp;
info->map[i].pfow_base = physmap_data->pfow_base;
Expand Down

0 comments on commit a670b52

Please sign in to comment.