diff --git a/arch/arm64/configs/slider_gki.fragment b/arch/arm64/configs/slider_gki.fragment
index ce919aa1556d..625b67f34237 100644
--- a/arch/arm64/configs/slider_gki.fragment
+++ b/arch/arm64/configs/slider_gki.fragment
@@ -83,7 +83,7 @@ CONFIG_CPIF_TP_MONITOR=m
 CONFIG_LINK_DEVICE_PCIE_GPIO_WA=y
 CONFIG_CP_WRESET_WA=y
 CONFIG_CP_THERMAL=m
-CONFIG_SUSPEND_DURING_VOICE_CALL=m
+CONFIG_SUSPEND_DURING_VOICE_CALL=y
 CONFIG_CH_EXTENSION=m
 CONFIG_MODEM_IF_QOS=m
 CONFIG_VIDEO_EXYNOS_MFC=m
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 09635fed0b01..283eefe4ad5f 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -280,7 +280,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
 		const struct vlan_priority_tci_mapping *mp
 			= vlan->egress_priority_map[i];
 		while (mp) {
-			seq_printf(seq, "%u:%hu ",
+			seq_printf(seq, "%u:%d ",
 				   mp->priority, ((mp->vlan_qos >> 13) & 0x7));
 			mp = mp->next;
 		}