evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fb: msm_dba: fix issue in dba driver" into dev/msm-4.4-8996au

Browse source
This commit is contained in:
Srivatsa Vaddagiri 2017-03-26 21:52:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1fa2159a4c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/fbdev/msm/msm_dba/adv7533.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1539,14 +1539,14 @@ exit:
static int adv7533_video_on(void *client, bool on, static int adv7533_video_on(void *client, bool on,
struct msm_dba_video_cfg *cfg, u32 flags) struct msm_dba_video_cfg *cfg, u32 flags)
{ {
int ret = -EINVAL; int ret = 0;
u8 lanes; u8 lanes;
u8 reg_val = 0; u8 reg_val = 0;
struct adv7533 *pdata = adv7533_get_platform_data(client); struct adv7533 *pdata = adv7533_get_platform_data(client);
if (!pdata || !cfg) { if (!pdata || !cfg) {
pr_err("%s: invalid platform data\n", __func__); pr_err("%s: invalid platform data\n", __func__);
return ret; return -EINVAL;
} }
mutex_lock(&pdata->ops_mutex); mutex_lock(&pdata->ops_mutex);

4
drivers/video/fbdev/msm/msm_dba/msm_dba_helpers.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, The Linux Foundation. All rights reserved. * Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -123,7 +123,7 @@ int msm_dba_helper_i2c_write_byte(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
pr_debug("%s: [%s:0x02%x] : W[0x%02x, 0x%02x]\n", __func__, pr_debug("%s: [%s:0x%02x] : W[0x%02x, 0x%02x]\n", __func__,
client->name, addr, reg, val); client->name, addr, reg, val);
client->addr = addr; client->addr = addr;