Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[karo-tx-linux.git] / drivers / gpu / drm / udl / udl_fb.c

diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index dbadd49e4c4a62bdd32c83473ad3751452e4033d..d1da339843cafb263b21030bc546b5f3d285b394 100644 (file)
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -421,7 +421,7 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
                                  clips[i].x2 - clips[i].x1,
                                  clips[i].y2 - clips[i].y1);
                if (ret)
-                       goto unlock;
+                       break;
        }
 
        if (ufb->obj->base.import_attach) {
@@ -550,7 +550,7 @@ out:
        return ret;
 }
 
-static struct drm_fb_helper_funcs udl_fb_helper_funcs = {
+static const struct drm_fb_helper_funcs udl_fb_helper_funcs = {
        .fb_probe = udlfb_create,
 };
 
@@ -583,7 +583,8 @@ int udl_fbdev_init(struct drm_device *dev)
                return -ENOMEM;
 
        udl->fbdev = ufbdev;
-       ufbdev->helper.funcs = &udl_fb_helper_funcs;
+
+       drm_fb_helper_prepare(dev, &ufbdev->helper, &udl_fb_helper_funcs);
 
        ret = drm_fb_helper_init(dev, &ufbdev->helper,
                                 1, 1);