diff options
Diffstat (limited to 'drivers/net/irda/sh_irda.c')
| -rw-r--r-- | drivers/net/irda/sh_irda.c | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c index edd5666f0ffb..9e3f4f54281d 100644 --- a/drivers/net/irda/sh_irda.c +++ b/drivers/net/irda/sh_irda.c | |||
| @@ -748,7 +748,6 @@ static int __devinit sh_irda_probe(struct platform_device *pdev) | |||
| 748 | struct net_device *ndev; | 748 | struct net_device *ndev; | 
| 749 | struct sh_irda_self *self; | 749 | struct sh_irda_self *self; | 
| 750 | struct resource *res; | 750 | struct resource *res; | 
| 751 | char clk_name[8]; | ||
| 752 | int irq; | 751 | int irq; | 
| 753 | int err = -ENOMEM; | 752 | int err = -ENOMEM; | 
| 754 | 753 | ||
| @@ -775,10 +774,9 @@ static int __devinit sh_irda_probe(struct platform_device *pdev) | |||
| 775 | if (err) | 774 | if (err) | 
| 776 | goto err_mem_2; | 775 | goto err_mem_2; | 
| 777 | 776 | ||
| 778 | snprintf(clk_name, sizeof(clk_name), "irda%d", pdev->id); | 777 | self->clk = clk_get(&pdev->dev, NULL); | 
| 779 | self->clk = clk_get(&pdev->dev, clk_name); | ||
| 780 | if (IS_ERR(self->clk)) { | 778 | if (IS_ERR(self->clk)) { | 
| 781 | dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name); | 779 | dev_err(&pdev->dev, "cannot get irda clock\n"); | 
| 782 | goto err_mem_3; | 780 | goto err_mem_3; | 
| 783 | } | 781 | } | 
| 784 | 782 | ||
