tty: vt, consw->con_set_palette cleanup

[mirror_ubuntu-artful-kernel.git] / drivers / video / console / vgacon.c

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index f447d6916991a863a40454c3660b1031451dc08f..aaae9bd239008d1f134006ac6aaa6703f65e976c 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -856,16 +856,13 @@ static void vga_set_palette(struct vc_data *vc, const unsigned char *table)
        }
 }
 
-static int vgacon_set_palette(struct vc_data *vc, const unsigned char *table)
+static void vgacon_set_palette(struct vc_data *vc, const unsigned char *table)
 {
 #ifdef CAN_LOAD_PALETTE
        if (vga_video_type != VIDEO_TYPE_VGAC || vga_palette_blanked
            || !CON_IS_VISIBLE(vc))
-               return -EINVAL;
+               return;
        vga_set_palette(vc, table);
-       return 0;
-#else
-       return -EINVAL;
 #endif
 }