From: Ayoung Sim Date: Tue, 23 Apr 2019 05:37:55 +0000 (+0900) Subject: [COMMON] media: mfc: Resolved Prevent Issue X-Git-Tag: MMI-QSAS30.62-33-3~882 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5482281272a16b34f191dbd20d17ea98e31e6c59;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [COMMON] media: mfc: Resolved Prevent Issue Fixed errors in mfc_watchdog.c: 1. Unsigned comparison against 0 2. Invalid Assignement(variable size difference) Change-Id: I0043d49ba651fe0f9e7992ce133d19cea6a65723 Signed-off-by: seungmin.ahn --- diff --git a/drivers/media/platform/exynos/mfc/mfc_watchdog.c b/drivers/media/platform/exynos/mfc/mfc_watchdog.c index e539591501e1..3ead54ae9db6 100644 --- a/drivers/media/platform/exynos/mfc/mfc_watchdog.c +++ b/drivers/media/platform/exynos/mfc/mfc_watchdog.c @@ -222,8 +222,7 @@ static void __mfc_save_logging_sfr(struct mfc_dev *dev) /* READ PAGE FAULT at AxID 0 ~ 3: PX */ if ((dev->logging_data->cause & (1 << MFC_CAUSE_0READ_PAGE_FAULT)) || (dev->logging_data->cause & (1 << MFC_CAUSE_1READ_PAGE_FAULT))) { - if (((dev->logging_data->fault_trans_info & 0xff) >= 0) && - ((dev->logging_data->fault_trans_info & 0xff) <= 3)) { + if ((dev->logging_data->fault_trans_info & 0xff) <= 3) { px_fault = true; for (i = 0; i < MFC_SFR_LOGGING_COUNT_SET2; i++) dev->logging_data->SFRs_set2[i] = MFC_READL(mfc_logging_sfr_set2[i]); @@ -265,7 +264,7 @@ static void __mfc_save_logging_sfr(struct mfc_dev *dev) dev->logging_data->last_int_sec = dev->last_int_time.tv_sec; dev->logging_data->last_int_usec = dev->last_int_time.tv_usec; dev->logging_data->hwlock_dev = dev->hwlock.dev; - dev->logging_data->hwlock_ctx = dev->hwlock.bits; + dev->logging_data->hwlock_ctx = (u32)(dev->hwlock.bits); dev->logging_data->num_inst = dev->num_inst; dev->logging_data->num_drm_inst = dev->num_drm_inst; dev->logging_data->power_cnt = mfc_pm_get_pwr_ref_cnt(dev);