Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbbLKDeB (ORCPT ); Thu, 10 Dec 2015 22:34:01 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:32887 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751318AbbLKDd7 (ORCPT ); Thu, 10 Dec 2015 22:33:59 -0500 From: Chunyan Zhang To: alexander.shishkin@linux.intel.com Cc: linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH] stm: the number of masters should be (sw_end - sw_start + 1) Date: Fri, 11 Dec 2015 11:26:50 +0800 Message-Id: <1449804410-16833-1-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1759 Lines: 44 sw_end represents the last software master, sw_start is index of the first master, so the number of software masters should be sw_end - sw_start + 1. Signed-off-by: Chunyan Zhang --- drivers/hwtracing/intel_th/sth.c | 2 +- drivers/hwtracing/stm/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c index 56101c3..28917d7 100644 --- a/drivers/hwtracing/intel_th/sth.c +++ b/drivers/hwtracing/intel_th/sth.c @@ -173,7 +173,7 @@ static int intel_th_sw_init(struct sth_device *sth) sth->stm.sw_start = reg & 0xffff; sth->stm.sw_end = reg >> 16; - sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start; + sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start + 1; dev_dbg(sth->dev, "sw_start: %x sw_end: %x masters: %x nchannels: %x\n", sth->stm.sw_start, sth->stm.sw_end, sth->sw_nmasters, sth->stm.sw_nchannels); diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 7f7bdb3..cb676f2 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -632,7 +632,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, if (!stm_data->packet || !stm_data->sw_nchannels) return -EINVAL; - nmasters = stm_data->sw_end - stm_data->sw_start; + nmasters = stm_data->sw_end - stm_data->sw_start + 1; stm = kzalloc(sizeof(*stm) + nmasters * sizeof(void *), GFP_KERNEL); if (!stm) return -ENOMEM; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/