lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 28 Oct 2015 14:53:45 +0100 From: Jiri Slaby <jslaby@...e.cz> To: stable@...r.kernel.org Cc: linux-kernel@...r.kernel.org, Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@...esas.com>, Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>, Mauro Carvalho Chehab <mchehab@....samsung.com>, Oliver Neukum <ONeukum@...e.com>, Jiri Slaby <jslaby@...e.cz> Subject: [PATCH 3.12 114/123] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@...esas.com> 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 45008ee9295b3ae96d7413ab91871907a671ca82 upstream. FXA bit of VI6_DPR_mod_ROUTE register starts from 16bit. But VI6_DPR_ROUTE_FXA_MASK is set to become start from 8bit. This fixes shift size for VI6_DPR_ROUTE_FXA_MASK. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@...esas.com> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@....samsung.com> Cc: Oliver Neukum <ONeukum@...e.com> Signed-off-by: Jiri Slaby <jslaby@...e.cz> --- drivers/media/platform/vsp1/vsp1_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h index 1d3304f1365b..46a5a6f16ad2 100644 --- a/drivers/media/platform/vsp1/vsp1_regs.h +++ b/drivers/media/platform/vsp1/vsp1_regs.h @@ -304,7 +304,7 @@ #define VI6_DPR_HST_ROUTE 0x2044 #define VI6_DPR_HSI_ROUTE 0x2048 #define VI6_DPR_BRU_ROUTE 0x204c -#define VI6_DPR_ROUTE_FXA_MASK (0xff << 8) +#define VI6_DPR_ROUTE_FXA_MASK (0xff << 16) #define VI6_DPR_ROUTE_FXA_SHIFT 16 #define VI6_DPR_ROUTE_FP_MASK (0xff << 8) #define VI6_DPR_ROUTE_FP_SHIFT 8 -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists