summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulián de Gortari <kiototeko@gmail.com>2017-02-19 21:02:32 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-06 09:16:59 +0100
commite8e9cd97860adaecf98ced1fbf175287b86671d4 (patch)
tree824a9777283f6cb4afc66a22bfc199387e5abcf3
parent027bcc5d28e7251acbca78039d99b51f3bb9e73a (diff)
downloadblackbird-obmc-linux-e8e9cd97860adaecf98ced1fbf175287b86671d4.tar.gz
blackbird-obmc-linux-e8e9cd97860adaecf98ced1fbf175287b86671d4.zip
Staging: fbtft: fb_watterott: fix incorrect type in assignments
__be16 type variables should be used with return value of macro cpu_to_be16() Signed-off-by: Julián de Gortari <kiototeko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/fbtft/fb_watterott.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c
index 429304546b44..180e5be6fa4f 100644
--- a/drivers/staging/fbtft/fb_watterott.c
+++ b/drivers/staging/fbtft/fb_watterott.c
@@ -69,8 +69,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
{
unsigned int start_line, end_line;
u16 *vmem16 = (u16 *)(par->info->screen_buffer + offset);
- u16 *pos = par->txbuf.buf + 1;
- u16 *buf16 = par->txbuf.buf + 10;
+ __be16 *pos = par->txbuf.buf + 1;
+ __be16 *buf16 = par->txbuf.buf + 10;
int i, j;
int ret = 0;
@@ -106,7 +106,7 @@ static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len)
{
unsigned int start_line, end_line;
u16 *vmem16 = (u16 *)(par->info->screen_buffer + offset);
- u16 *pos = par->txbuf.buf + 1;
+ __be16 *pos = par->txbuf.buf + 1;
u8 *buf8 = par->txbuf.buf + 10;
int i, j;
int ret = 0;
OpenPOWER on IntegriCloud