Merge "msm-pm: Fix pc_debug_counter for 64bit kernel" (5c4f4570) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qcom/msm-pm.c

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -646,7 +646,7 @@ static struct platform_driver msm_cpu_pm_snoc_client_driver = {
	};		};

	struct msm_pc_debug_counters_buffer {		struct msm_pc_debug_counters_buffer {
	int *reg;		long *reg;
	u32 len;		u32 len;
	char buf[MAX_BUF_SIZE];		char buf[MAX_BUF_SIZE];
	};		};
	@@ -680,7 +680,7 @@ static int msm_pc_debug_counters_copy(

	data->len += len;		data->len += len;

	for (j = 0; j < MSM_PC_NUM_COUNTERS; j++) {		for (j = 0; j < MSM_PC_NUM_COUNTERS - 1; j++) {
	stat = data->reg[offset + j];		stat = data->reg[offset + j];
	len = scnprintf(data->buf + data->len,		len = scnprintf(data->buf + data->len,
	sizeof(data->buf) - data->len,		sizeof(data->buf) - data->len,
	@@ -688,7 +688,11 @@ static int msm_pc_debug_counters_copy(

	data->len += len;		data->len += len;
	}		}
			len = scnprintf(data->buf + data->len,
			sizeof(data->buf) - data->len,
			"\n");

			data->len += len;
	}		}

	return data->len;		return data->len;
	@@ -737,7 +741,7 @@ static int msm_pc_debug_counters_file_open(struct inode *inode,
	}		}

	buf = file->private_data;		buf = file->private_data;
	buf->reg = (int *)inode->i_private;		buf->reg = (long *)inode->i_private;

	return 0;		return 0;
	}		}