diff options
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-la.dts | 30 | ||||
| -rw-r--r-- | drivers/media/platform/msm/ais/isp/msm_isp_axi_util.c | 9 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 19 |
3 files changed, 33 insertions, 25 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-la.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-la.dts index 304a2ad4268f..ddc016da2597 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-la.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-la.dts @@ -228,7 +228,7 @@ qcom,mode = <0>; qcom,vin-sel = <2>; qcom,src-sel = <0>; - status = "okay"; + status = "disabled"; }; gpio@c800 { /* GPIO 9 - Rome 3.3V control */ @@ -239,7 +239,7 @@ qcom,src-sel = <0>; /* Constant */ qcom,out-strength = <1>; /* High drive strength */ qcom,master-en = <1>; /* Enable GPIO */ - status = "okay"; + status = "disabled"; }; gpio@c900 { /* GPIO 10 - NFC CLK _REQ*/ @@ -247,7 +247,7 @@ qcom,vin-sel = <2>; qcom,src-sel = <0>; qcom,master-en = <1>; - status = "okay"; + status = "disabled"; }; gpio@cd00 { /* GPIO 14 - lcd_bklt_reg_en */ @@ -258,35 +258,35 @@ qcom,src-sel = <0>; /* CONSTANT */ qcom,out-strength = <1>; /* Low drive strength */ qcom,master-en = <1>; /* ENABLE GPIO */ - status = "okay"; + status = "disabled"; }; gpio@c100 { /* GPIO 2 */ qcom,mode = <0>; qcom,pull = <0>; qcom,vin-sel = <2>; qcom,src-sel = <0>; - status = "okay"; + status = "disabled"; }; gpio@c300 { /* GPIO 4 - adv7481 RST */ qcom,mode = <1>; qcom,pull = <0>; qcom,vin-sel = <2>; qcom,src-sel = <0>; - status = "okay"; + status = "disabled"; }; gpio@c400 { /* GPIO 5 - adv7481 INT1 */ qcom,mode = <0>; qcom,vin-sel = <2>; qcom,src-sel = <0>; - status = "okay"; + status = "disabled"; }; gpio@c500 { /* GPIO 6 - adv7481 INT2*/ qcom,mode = <0>; qcom,vin-sel = <2>; qcom,src-sel = <0>; - status = "okay"; + status = "disabled"; }; gpio@ca00 { /* GPIO 11 - USB enb1 (otg switch) */ @@ -305,7 +305,7 @@ qcom,out-strength = <1>; qcom,src-sel = <0>; /* GPIO */ qcom,master-en = <1>; /* Enable GPIO */ - status = "okay"; + status = "disabled"; }; gpio@ce00 { /* GPIO 15 */ @@ -316,7 +316,7 @@ qcom,out-strength = <1>; qcom,src-sel = <2>; qcom,master-en = <1>; - status = "okay"; + status = "disabled"; }; gpio@d000 { /* GPIO 17 - USB1 VBUS detect */ qcom,mode = <0>; /* Digital Input*/ @@ -335,7 +335,7 @@ qcom,src-sel = <3>; /* Function 2 */ qcom,out-strength = <2>; /* Medium */ qcom,master-en = <1>; /* Enable GPIO */ - status = "okay"; + status = "disabled"; }; gpio@d200 { /* GPIO 19 - Rome BT Reset */ @@ -349,6 +349,14 @@ }; }; +&pm8994_adc_tm { + status = "disabled"; +}; + +&pm8994_vadc { + status = "disabled"; +}; + &sde_kms_hyp { qcom,client-id = "7815"; }; diff --git a/drivers/media/platform/msm/ais/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/ais/isp/msm_isp_axi_util.c index f135cfcd6ccd..cd32f62db2f4 100644 --- a/drivers/media/platform/msm/ais/isp/msm_isp_axi_util.c +++ b/drivers/media/platform/msm/ais/isp/msm_isp_axi_util.c @@ -3968,7 +3968,7 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev, struct msm_isp_buffer *done_buf = NULL; unsigned long flags; struct timeval *time_stamp; - struct timeval *time_stamp_system; + struct timeval *time_stamp_system = NULL; uint32_t frame_id, buf_index = -1; struct msm_vfe_axi_stream *temp_stream; @@ -4124,9 +4124,10 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev, stream_info, done_buf, time_stamp, frame_id); return; } - - msm_isp_process_done_buf(vfe_dev, stream_info, - done_buf, time_stamp, time_stamp_system, frame_id); + if (time_stamp_system != NULL) { + msm_isp_process_done_buf(vfe_dev, stream_info, + done_buf, time_stamp, time_stamp_system, frame_id); + } } void msm_isp_process_axi_irq(struct vfe_device *vfe_dev, diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 8b5988e210d5..be90b5c561d6 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -2181,21 +2181,20 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter, use_tpd->buffer_addr = cpu_to_le64(buffer_info->dma); use_tpd->buffer_len = cpu_to_le16(buffer_info->length); } - - /* The last tpd */ - use_tpd->word1 |= 1 << TPD_EOP_SHIFT; - /* The last buffer info contain the skb address, - so it will be free after unmap */ - buffer_info->skb = skb; - - return 0; - + if (use_tpd && buffer_info) { + /*The last tpd*/ + use_tpd->word1 |= 1 << TPD_EOP_SHIFT; + /*The last buffer info contain the skb address, + *so it will be free after unmap + */ + buffer_info->skb = skb; + return 0; + } err_dma: buffer_info->dma = 0; buffer_info->length = 0; return -1; } - static void atl1c_tx_queue(struct atl1c_adapter *adapter, struct sk_buff *skb, struct atl1c_tpd_desc *tpd, enum atl1c_trans_queue type) { |