Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rkfb_sysfs.c

diff --git a/drivers/video/rockchip/rkfb_sysfs.c b/drivers/video/rockchip/rkfb_sysfs.c
old mode 100755 (executable)
new mode 100644 (file)
index a6a2f61..6a9f603
--- a/drivers/video/rockchip/rkfb_sysfs.c
+++ b/drivers/video/rockchip/rkfb_sysfs.c
@@ -48,6 +48,7 @@ static char *get_format_str(enum data_format format)
        case RGB565:
                return "RGB565";
        case YUV420:
+       case YUV420_NV21:
                return "YUV420";
        case YUV422:
                return "YUV422";
@@ -72,10 +73,8 @@ static char *get_format_str(enum data_format format)
        case FBDC_RGBX_888:
                return "FBDC_RGBX_888";
        default:
-               break;
+               return "invalid";        
        }
-
-       return "invalid";
 }
 
 static ssize_t show_screen_info(struct device *dev,