Merge "mmc: msm_sdcc: enable the write packing control" into msm-3.0
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 82ac58c..79af1a7 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -1281,6 +1281,7 @@
static struct mdm_platform_data sglte_platform_data = {
.mdm_version = "4.0",
.ramdump_delay_ms = 1000,
+ .soft_reset_inverted = 1,
.peripheral_platform_device = NULL,
};
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 2a6a900..7fd2d91 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -1573,7 +1573,8 @@
__mdp_histogram_kickoff(mgmt);
if (isr & INTR_HIST_DONE) {
- if (waitqueue_active(&mgmt->mdp_hist_comp.wait)) {
+ if ((waitqueue_active(&mgmt->mdp_hist_comp.wait))
+ && (mgmt->hist != NULL)) {
if (!queue_work(mdp_hist_wq,
&mgmt->mdp_histogram_worker)) {
pr_err("%s %d- can't queue hist_read\n",