Merge remote-tracking branch 'qcom/qcom/for-next'

[karo-tx-linux.git] / arch / x86 / kernel / sysfb_simplefb.c

diff --git a/arch/x86/kernel/sysfb_simplefb.c b/arch/x86/kernel/sysfb_simplefb.c
index 86179d4098938d50e13f25b6e75cfe8a198b7b80..764a29f84de7feea6346ce1d822af64f14af63ff 100644 (file)
--- a/arch/x86/kernel/sysfb_simplefb.c
+++ b/arch/x86/kernel/sysfb_simplefb.c
@@ -88,8 +88,5 @@ __init int create_simplefb(const struct screen_info *si,
 
        pd = platform_device_register_resndata(NULL, "simple-framebuffer", 0,
                                               &res, 1, mode, sizeof(*mode));
-       if (IS_ERR(pd))
-               return PTR_ERR(pd);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(pd);
 }