lkml.org 
[lkml]   [2017]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/8] video: fbdev: au1200fb: Propagate an error code
    Date
    We should propagate the error code returned by 'fb_alloc_cmap()' instead
    of returning -EFAULT.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    ---
    drivers/video/fbdev/au1200fb.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
    index 970ce761ff89..687ea2a8f810 100644
    --- a/drivers/video/fbdev/au1200fb.c
    +++ b/drivers/video/fbdev/au1200fb.c
    @@ -1518,7 +1518,7 @@ static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id)
    static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
    {
    struct fb_info *fbi = fbdev->fb_info;
    - int bpp;
    + int bpp, ret;

    fbi->fbops = &au1200fb_fb_ops;

    @@ -1550,10 +1550,11 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
    return -ENOMEM;
    }

    - if (fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
    + ret = fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0);
    + if (ret < 0) {
    print_err("Fail to allocate colormap (%d entries)",
    AU1200_LCD_NBR_PALETTE_ENTRIES);
    - return -EFAULT;
    + return ret;
    }

    strncpy(fbi->fix.id, "AU1200", sizeof(fbi->fix.id));
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-10-16 21:07    [W:2.701 / U:0.868 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site