Merge tag 'drm-amdkfd-next-fixes-2016-03-15' of git://people.freedesktop.org/~gabbayo/linux into drm-next

airlied · airlied · commit c51e034fedb0 · 2016-03-16T11:09:00.000+10:00
* tag 'drm-amdkfd-next-fixes-2016-03-15' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: uninitialized variable in dbgdev_wave_control_set_registers()
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
@@ -513,7 +513,7 @@ static int dbgdev_wave_control_set_registers(
 				union SQ_CMD_BITS *in_reg_sq_cmd,
 				union GRBM_GFX_INDEX_BITS *in_reg_gfx_index)
 {
-	int status;
+	int status = 0;
 	union SQ_CMD_BITS reg_sq_cmd;
 	union GRBM_GFX_INDEX_BITS reg_gfx_index;
 	struct HsaDbgWaveMsgAMDGen2 *pMsg;

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ static int dbgdev_wave_control_set_registers(`
`513`	`513`	`union SQ_CMD_BITS *in_reg_sq_cmd,`
`514`	`514`	`union GRBM_GFX_INDEX_BITS *in_reg_gfx_index)`
`515`	`515`	`{`
`516`		`- int status;`
	`516`	`+ int status = 0;`
`517`	`517`	`union SQ_CMD_BITS reg_sq_cmd;`
`518`	`518`	`union GRBM_GFX_INDEX_BITS reg_gfx_index;`
`519`	`519`	`struct HsaDbgWaveMsgAMDGen2 *pMsg;`