Merge tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux

[firefly-linux-kernel-4.4.55.git] / drivers / staging / fbtft / fb_s6d02a1.c

diff --git a/drivers/staging/fbtft/fb_s6d02a1.c b/drivers/staging/fbtft/fb_s6d02a1.c
index e412a42443e5d2436e7bc9ecad190907fbcddbdb..f3302525ec0092992e2dc872de7cd143890f0f74 100644 (file)
--- a/drivers/staging/fbtft/fb_s6d02a1.c
+++ b/drivers/staging/fbtft/fb_s6d02a1.c
@@ -108,7 +108,7 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
        /* Column address */
        write_reg(par, 0x2A, xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF);
 
-       /* Row adress */
+       /* Row address */
        write_reg(par, 0x2B, ys >> 8, ys & 0xFF, ye >> 8, ye & 0xFF);
 
        /* Memory write */
@@ -136,7 +136,7 @@ static int set_var(struct fbtft_par *par)
                write_reg(par, 0x36, MY | MV | (par->bgr << 3));
                break;
        case 180:
-               write_reg(par, 0x36, (par->bgr << 3));
+               write_reg(par, 0x36, par->bgr << 3);
                break;
        case 90:
                write_reg(par, 0x36, MX | MV | (par->bgr << 3));