Merge remote-tracking branch 'android-tegra/android-tegra3-grouper-3.1-jb-mr1.1' into jb422
diff --git a/drivers/input/proximity/cap1106.c b/drivers/input/proximity/cap1106.c
index c782996..570a18f 100644
--- a/drivers/input/proximity/cap1106.c
+++ b/drivers/input/proximity/cap1106.c
@@ -72,6 +72,7 @@
static int c2_acc_cnt = 0;
static int c6_acc_cnt = 0;
static int acc_limit = 10;
+static int force_enable = 1;
/*----------------------------------------------------------------------------
** FUNCTION DECLARATION
@@ -472,6 +473,7 @@
return -EINVAL;
mutex_lock(&prox_mtx);
+ force_enable = enable;
cap1106_enable_sensor(client, enable);
mutex_unlock(&prox_mtx);
@@ -892,7 +894,8 @@
{
PROX_DEBUG("+\n");
mutex_lock(&prox_mtx);
- cap1106_enable_sensor(client, 1);
+ if (force_enable)
+ cap1106_enable_sensor(client, 1);
mutex_unlock(&prox_mtx);
PROX_DEBUG("-\n");
return 0;
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index c2f4d33..66b55cf 100755
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -3380,7 +3380,6 @@
setbit(eventmask, WLC_E_ACTION_FRAME_RX);
setbit(eventmask, WLC_E_ACTION_FRAME_COMPLETE);
setbit(eventmask, WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE);
- setbit(eventmask, WLC_E_P2P_PROBREQ_MSG);
setbit(eventmask, WLC_E_P2P_DISC_LISTEN_COMPLETE);
}
#endif /* WL_CFG80211 */
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index b4f47d1..2f28bf1 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -331,7 +331,6 @@
*/
static s32 __wl_cfg80211_up(struct wl_priv *wl);
static s32 __wl_cfg80211_down(struct wl_priv *wl);
-static s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add);
static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e);
static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e, struct net_device *ndev);
static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e);
@@ -7089,7 +7088,7 @@
return 0;
}
-static s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add)
+s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add)
{
s8 iovbuf[WL_EVENTING_MASK_LEN + 12];
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.h b/drivers/net/wireless/bcmdhd/wl_cfg80211.h
index dfb0d0d..6d237ee 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.h
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.h
@@ -689,4 +689,5 @@
extern s32 wl_update_wiphybands(struct wl_priv *wl);
extern s32 wl_cfg80211_if_is_group_owner(void);
extern int wl_cfg80211_update_power_mode(struct net_device *dev);
+extern s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add);
#endif /* _wl_cfg80211_h_ */
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
index 7bcd144..aedf970 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
@@ -641,7 +641,7 @@
}
set_ie:
ret = wl_cfgp2p_set_management_ie(wl, dev,
- wl_cfgp2p_find_idx(wl, dev),
+ wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE),
VNDR_IE_PRBREQ_FLAG, ie, ie_len);
if (unlikely(ret < 0)) {
@@ -1230,6 +1230,10 @@
}
cfg80211_remain_on_channel_expired(ndev, wl->last_roc_id, &wl->remain_on_chan,
wl->remain_on_chan_type, GFP_KERNEL);
+ if (wl_add_remove_eventmsg(wl_to_prmry_ndev(wl),
+ WLC_E_P2P_PROBREQ_MSG, false) != BCME_OK) {
+ CFGP2P_ERR((" failed to unset WLC_E_P2P_PROPREQ_MSG\n"));
+ }
} else
wl_clr_p2p_status(wl, LISTEN_EXPIRED);
@@ -1321,6 +1325,9 @@
} else
wl_clr_p2p_status(wl, LISTEN_EXPIRED);
+ if (wl_add_remove_eventmsg(wl_to_prmry_ndev(wl), WLC_E_P2P_PROBREQ_MSG, true) != BCME_OK) {
+ CFGP2P_ERR((" failed to set WLC_E_P2P_PROPREQ_MSG\n"));
+ }
wl_cfgp2p_set_p2p_mode(wl, WL_P2P_DISC_ST_LISTEN, channel, (u16) duration_ms,
wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE));
_timer = &wl->p2p->listen_timer;
diff --git a/drivers/video/tegra/host/nvhost_job.c b/drivers/video/tegra/host/nvhost_job.c
index df7a62d..576be43 100644
--- a/drivers/video/tegra/host/nvhost_job.c
+++ b/drivers/video/tegra/host/nvhost_job.c
@@ -74,6 +74,8 @@
32, NVMAP_HANDLE_CACHEABLE, 0);
if (IS_ERR_OR_NULL(job->gather_mem)) {
err = PTR_ERR(job->gather_mem);
+ if (!job->gather_mem)
+ err = -ENOMEM;
job->gather_mem = NULL;
goto error;
}
@@ -83,6 +85,8 @@
job->gathers = nvmap_mmap(job->gather_mem);
if (IS_ERR_OR_NULL(job->gathers)) {
err = PTR_ERR(job->gathers);
+ if (!job->gathers)
+ err = -ENOMEM;
job->gathers = NULL;
goto error;
}