lkml.org 
[lkml]   [2010]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/16] viafb: Unmap the frame buffer on initialization error
    Date
    This was part of Harald's "make viafb a first-class citizen using
    pci_driver" patch, but somehow got dropped when that patch went into
    mainline.

    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
    ---
    drivers/video/via/viafbdev.c | 4 +++-
    1 files changed, 3 insertions(+), 1 deletions(-)

    diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
    index 91bfe6d..4a34d4f 100644
    --- a/drivers/video/via/viafbdev.c
    +++ b/drivers/video/via/viafbdev.c
    @@ -1991,7 +1991,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
    if (!viafbinfo1) {
    printk(KERN_ERR
    "allocate the second framebuffer struct error\n");
    - goto out_delete_i2c;
    + goto out_unmap_screen;
    }
    viaparinfo1 = viafbinfo1->par;
    memcpy(viaparinfo1, viaparinfo, viafb_par_length);
    @@ -2086,6 +2086,8 @@ out_dealloc_cmap:
    out_fb1_release:
    if (viafbinfo1)
    framebuffer_release(viafbinfo1);
    +out_unmap_screen:
    + iounmap(viafbinfo->screen_base);
    out_delete_i2c:
    viafb_delete_i2c_buss(viaparinfo);
    out_fb_release:
    --
    1.7.0.1


    \
     
     \ /
      Last update: 2010-04-08 19:19    [W:0.019 / U:30.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site