Revert "msm: camera2: add api for set actuator for manual af".

This reverts commit a5d15da46bc1fa3467310e2c5aa998c365a78c00.

Change-Id: Id237577daf723e8e60600615c8202453d6337485
Signed-off-by: Panwar Vivek <vpanwa@codeaurora.org>
Merge "msm: mdss: Check extra mmb allocated to a pipe"
msm: cpp: Fix potential dereference of NULL pointer

Pointers should be checked for NULL before they are
dereferenced. If it is not done segmentation fault
can appear.

Change-Id: I8b36f3553292b41386e231f12867ff78f8e2379d
Signed-off-by: Iliya Varadzhakov <ivarad@codeaurora.org>
msm: camera2: cpp: Append frame buffers to the list

In case of late buffer allocation, allocated buffers
have to be appended to the existing queues.

Change-Id: Ie14f00038e86b9d7c8caa01587a2ed1aee7d80e8
Signed-off-by: Iliya Varadzhakov <ivarad@codeaurora.org>
Merge "Merge "Merge "diag: dci: Preventing unitialized stack memcpy operation"""
Merge "Merge "leds: leds-qpnp: Reset WLED enable register in wled init function""
Merge "Revert "msm: wfd: Restart hrtimer after forwarding it""
Merge "Merge "Merge "leds: leds-qpnp: Reset WLED enable register in wled init function"""
Merge "Merge "msm: mdss: Check extra mmb allocated to a pipe""
Merge "Merge "Merge "msm: mdss: Check extra mmb allocated to a pipe"""
Merge "Merge "Revert "msm: wfd: Restart hrtimer after forwarding it"""
power: qpnp-bms: fix unbalanced IRQs in qpnp-bms.c

In qpnp-bms.c there is a bug where IRQs are getting used
before being registered. Hence, bms_request_irqs() needs
to be moved before battery_insertion_check().

CRs-fixed: 596174
Change-Id: I74c2aa9e14495c22b3cdaa1a3d1f712f9b3cabf6
Signed-off-by: Xu Kai <kaixu@codeaurora.org>
USB: msm_otg: Fix race between PM resume and charger detection

When device is in system suspend and USB charger is disconnected,
then due to VBUS clear IRQ from PMIC, the device will be PM resumed.
Now shortly if PMIC driver detects valid VBUS it will handle VBUS
set condition,notifies to msm_otg and msm_otg will kick in charger
detection mechanism. During PM resume, in dmp_complete() it will
call a pm_runtime_put_sync(), which will immediately kick off the
PM runtime idle and suspend routines.
dpm_complete()
  ->device_complete()
    ->pm_runtime_put_sync()
      ->rpm_idle()
        ->rpm_suspend()

The PM resume also runs in a separate worker queue, so it is not
guaranteed that it will finish executing before we finish the charger
detection stage. During this case there is a race if dpm_complete()
returns before charger detection starts. Return of dmp_cpmplete()
before charger detection will make USB to enter LPM. As USB will be
in LPM now and if charger detection starts then it will lead to
unclocked access.

Fixing the issue by handling the pm usage count using the variable
pm_done in msm_otg. When USB charger is disconnected and msm_otg
processes the disconnect event it marks the pm_done to true. Later
when USB charger is connected , mark the pm_done to false in
msm_otg_runtime_resume(). If pm_done is true increment the pm counter
using pm_runtime_get_sync. This handles the race case when PM resume
thread returns before the charger detection starts.

CRs-Fixed: 599143
Change-Id: I6de19fe850e24efa03ea71c7d14e388c15cf2f97
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
Merge "Merge "Merge "Revert "msm: wfd: Restart hrtimer after forwarding it""""
Merge "msm: kgsl: Pass the right timeout to adreno_drawctxt_wait()"
Merge "msm: kgsl: Fix the api type in adreno drawctxt flags"
Merge "msm: kgsl: protect syncpoint events with a reference count"
Merge "msm: kgsl: fix race condition setting the event->handle"
Merge "msm: mdss: call suspend and resume panel events during runtime triggers"
Merge "Revert "ASoC: msm: qdsp6v2: disable OCMEM by default""