Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208714
b: refs/heads/master
c: 8a2b6be
h: refs/heads/master
v: v3
  • Loading branch information
Kuninori Morimoto authored and Paul Mundt committed Aug 4, 2010
1 parent 8d13b99 commit 956711f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 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: 6e86ccad15c01e2239da9a76cfbfbf41bbe332ba
refs/heads/master: 8a2b6beffc88b83089845d72eed2ed74eb5c9b1e
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-shmobile/board-g3evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ static struct resource irda_resources[] = {

static struct platform_device irda_device = {
.name = "sh_irda",
.id = -1,
.resource = irda_resources,
.num_resources = ARRAY_SIZE(irda_resources),
};
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/net/irda/sh_irda.c
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,6 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
struct net_device *ndev;
struct sh_irda_self *self;
struct resource *res;
char clk_name[8];
unsigned int irq;
int err = -ENOMEM;

Expand All @@ -775,10 +774,9 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
if (err)
goto err_mem_2;

snprintf(clk_name, sizeof(clk_name), "irda%d", pdev->id);
self->clk = clk_get(&pdev->dev, clk_name);
self->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(self->clk)) {
dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
dev_err(&pdev->dev, "cannot get irda clock\n");
goto err_mem_3;
}

Expand Down

0 comments on commit 956711f

Please sign in to comment.