diff options
| -rw-r--r-- | drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c | 16 | ||||
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c | 3 | ||||
| -rw-r--r-- | drivers/soc/qcom/system_pm.c | 5 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-msm-qusb.c | 4 | ||||
| -rw-r--r-- | fs/ext4/page-io.c | 6 |
5 files changed, 18 insertions, 16 deletions
diff --git a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index c1aa501e229d8..dc69e794e8cb4 100644 --- a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -1118,14 +1118,14 @@ static int cam_ife_hw_mgr_acquire_res_ife_csid_rdi( continue; /* get cid resource */ - rc = cam_ife_mgr_acquire_cid_res(ife_ctx, - in_port, &cid_res_id, - cam_ife_hw_mgr_get_ife_csid_rdi_res_type( - out_port->res_type)); - if (rc) { - CAM_ERR(CAM_ISP, - "Acquire IFE CID resource Failed"); - goto err; + rc = cam_ife_mgr_acquire_cid_res(ife_ctx, + in_port, &cid_res_id, + cam_ife_hw_mgr_get_ife_csid_rdi_res_type( + out_port->res_type)); + if (rc) { + CAM_ERR(CAM_ISP, + "Acquire IFE CID resource Failed"); + goto err; } rc = cam_ife_hw_mgr_get_res(&ife_ctx->free_res_list, diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c b/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c index b16cc0c64904e..793d13c003cf3 100644 --- a/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c +++ b/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c @@ -671,9 +671,10 @@ static int ipa_uc_ntn_disconn_pipes(struct ipa_uc_offload_ctx *ntn_ctx) ret); return -EFAULT; } - if (ntn_ctx->conn.dl.smmu_enabled) + if (ntn_ctx->conn.dl.smmu_enabled) { ipa_uc_ntn_free_conn_smmu_info(&ntn_ctx->conn.dl); ipa_uc_ntn_free_conn_smmu_info(&ntn_ctx->conn.ul); + } return ret; } diff --git a/drivers/soc/qcom/system_pm.c b/drivers/soc/qcom/system_pm.c index 1befdcf32aa66..490f2086d5b80 100644 --- a/drivers/soc/qcom/system_pm.c +++ b/drivers/soc/qcom/system_pm.c @@ -81,7 +81,7 @@ static void system_sleep_exit(void) gic_v3_dist_restore(); } -static struct system_pm_ops pm_ops = { +struct system_pm_ops pm_ops = { .enter = system_sleep_enter, .exit = system_sleep_exit, .update_wakeup = system_sleep_update_wakeup, @@ -94,7 +94,8 @@ static int sys_pm_probe(struct platform_device *pdev) if (IS_ERR_OR_NULL(rpmh_client)) return PTR_ERR(rpmh_client); - return register_system_pm_ops(&pm_ops); + return 0; +// return register_system_pm_ops(&pm_ops); } static const struct of_device_id sys_pm_drv_match[] = { diff --git a/drivers/usb/phy/phy-msm-qusb.c b/drivers/usb/phy/phy-msm-qusb.c index 47db12bef9c64..9842a2940d0d8 100644 --- a/drivers/usb/phy/phy-msm-qusb.c +++ b/drivers/usb/phy/phy-msm-qusb.c @@ -1037,8 +1037,8 @@ static int qusb_phy_probe(struct platform_device *pdev) if (IS_ERR(qphy->iface_clk)) { ret = PTR_ERR(qphy->iface_clk); qphy->iface_clk = NULL; - if (ret == -EPROBE_DEFER) - return ret; + if (ret == -EPROBE_DEFER) + return ret; dev_err(dev, "couldn't get iface_clk(%d)\n", ret); } } diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 8d4ec1abd01f5..fb34eb8aa703c 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -469,9 +469,9 @@ int ext4_bio_write_page(struct ext4_io_submit *io, nr_to_submit) { gfp_t gfp_flags = GFP_NOFS; - retry_encrypt: - if (!fscrypt_using_hardware_encryption(inode)) - data_page = fscrypt_encrypt_page(inode, page, PAGE_SIZE, 0, +retry_encrypt: + if (!fscrypt_using_hardware_encryption(inode)) + data_page = fscrypt_encrypt_page(inode, page, PAGE_SIZE, 0, page->index, gfp_flags); if (IS_ERR(data_page)) { ret = PTR_ERR(data_page); |