.. | .. |
---|
523 | 523 | |
---|
524 | 524 | info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev); |
---|
525 | 525 | if (!info) |
---|
526 | | - goto err; |
---|
| 526 | + goto err_fb_alloc; |
---|
527 | 527 | |
---|
528 | 528 | info->screen_base = (char __iomem *)videomemory; |
---|
529 | 529 | info->fbops = &arcfb_ops; |
---|
.. | .. |
---|
535 | 535 | |
---|
536 | 536 | if (!dio_addr || !cio_addr || !c2io_addr) { |
---|
537 | 537 | printk(KERN_WARNING "no IO addresses supplied\n"); |
---|
538 | | - goto err1; |
---|
| 538 | + goto err_addr; |
---|
539 | 539 | } |
---|
540 | 540 | par->dio_addr = dio_addr; |
---|
541 | 541 | par->cio_addr = cio_addr; |
---|
.. | .. |
---|
551 | 551 | printk(KERN_INFO |
---|
552 | 552 | "arcfb: Failed req IRQ %d\n", par->irq); |
---|
553 | 553 | retval = -EBUSY; |
---|
554 | | - goto err1; |
---|
| 554 | + goto err_addr; |
---|
555 | 555 | } |
---|
556 | 556 | } |
---|
557 | 557 | retval = register_framebuffer(info); |
---|
558 | 558 | if (retval < 0) |
---|
559 | | - goto err1; |
---|
| 559 | + goto err_register_fb; |
---|
560 | 560 | platform_set_drvdata(dev, info); |
---|
561 | 561 | fb_info(info, "Arc frame buffer device, using %dK of video memory\n", |
---|
562 | 562 | videomemorysize >> 10); |
---|
.. | .. |
---|
580 | 580 | } |
---|
581 | 581 | |
---|
582 | 582 | return 0; |
---|
583 | | -err1: |
---|
| 583 | + |
---|
| 584 | +err_register_fb: |
---|
| 585 | + free_irq(par->irq, info); |
---|
| 586 | +err_addr: |
---|
584 | 587 | framebuffer_release(info); |
---|
585 | | -err: |
---|
| 588 | +err_fb_alloc: |
---|
586 | 589 | vfree(videomemory); |
---|
587 | 590 | return retval; |
---|
588 | 591 | } |
---|