diff options
Diffstat (limited to 'drivers/video/amba-clcd.c')
-rw-r--r-- | drivers/video/amba-clcd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index a3c2c45e29e0..69421c86252c 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c | |||
@@ -346,10 +346,6 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
346 | goto out; | 346 | goto out; |
347 | } | 347 | } |
348 | 348 | ||
349 | ret = clk_use(fb->clk); | ||
350 | if (ret) | ||
351 | goto free_clk; | ||
352 | |||
353 | fb->fb.fix.mmio_start = fb->dev->res.start; | 349 | fb->fb.fix.mmio_start = fb->dev->res.start; |
354 | fb->fb.fix.mmio_len = SZ_4K; | 350 | fb->fb.fix.mmio_len = SZ_4K; |
355 | 351 | ||
@@ -357,7 +353,7 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
357 | if (!fb->regs) { | 353 | if (!fb->regs) { |
358 | printk(KERN_ERR "CLCD: unable to remap registers\n"); | 354 | printk(KERN_ERR "CLCD: unable to remap registers\n"); |
359 | ret = -ENOMEM; | 355 | ret = -ENOMEM; |
360 | goto unuse_clk; | 356 | goto free_clk; |
361 | } | 357 | } |
362 | 358 | ||
363 | fb->fb.fbops = &clcdfb_ops; | 359 | fb->fb.fbops = &clcdfb_ops; |
@@ -427,8 +423,6 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
427 | printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret); | 423 | printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret); |
428 | 424 | ||
429 | iounmap(fb->regs); | 425 | iounmap(fb->regs); |
430 | unuse_clk: | ||
431 | clk_unuse(fb->clk); | ||
432 | free_clk: | 426 | free_clk: |
433 | clk_put(fb->clk); | 427 | clk_put(fb->clk); |
434 | out: | 428 | out: |
@@ -489,7 +483,6 @@ static int clcdfb_remove(struct amba_device *dev) | |||
489 | clcdfb_disable(fb); | 483 | clcdfb_disable(fb); |
490 | unregister_framebuffer(&fb->fb); | 484 | unregister_framebuffer(&fb->fb); |
491 | iounmap(fb->regs); | 485 | iounmap(fb->regs); |
492 | clk_unuse(fb->clk); | ||
493 | clk_put(fb->clk); | 486 | clk_put(fb->clk); |
494 | 487 | ||
495 | fb->board->remove(fb); | 488 | fb->board->remove(fb); |