Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33325
b: refs/heads/master
c: dd2c609
h: refs/heads/master
i:
  33323: a25a16a
v: v3
  • Loading branch information
Pierre Ossman authored and Russell King committed Aug 7, 2006
1 parent c7b1b83 commit 866952c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 916f3ac680fcc4c142e9acd46161f55533b11760
refs/heads/master: dd2c609c59cd9daeb90d58f3d1bc3813e8987df1
3 changes: 2 additions & 1 deletion trunk/drivers/mmc/wbsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
/*
* Request resources.
*/
ret = wbsd_request_resources(host, io, irq, dma);
ret = wbsd_request_resources(host, base, irq, dma);
if (ret) {
wbsd_release_resources(host);
wbsd_free_mmc(dev);
Expand Down Expand Up @@ -1861,6 +1861,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp)

static int __devinit wbsd_probe(struct platform_device *dev)
{
/* Use the module parameters for resources */
return wbsd_init(&dev->dev, io, irq, dma, 0);
}

Expand Down

0 comments on commit 866952c

Please sign in to comment.