diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-01 21:56:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-01 21:56:39 -0700 |
| commit | 3cfc91a2b477998d3dfa60cf76bffb67efbf2829 (patch) | |
| tree | a7542ed74449cb4a63932f08c79693568c58bb42 | |
| parent | cf554e72cc15c763610960da41fc7ffeebd38320 (diff) | |
| parent | f97da074186f8cb7b8b5beba3fbab4f6850508ed (diff) | |
Merge "Revert "coresight-tpdm: fix dsb edge ctrl mask interface""
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-tpdm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c index a80f07b88b42..3a11b061e5b0 100644 --- a/drivers/hwtracing/coresight/coresight-tpdm.c +++ b/drivers/hwtracing/coresight/coresight-tpdm.c @@ -2647,11 +2647,11 @@ static ssize_t tpdm_store_dsb_edge_ctrl_mask(struct device *dev, size_t size) { struct tpdm_drvdata *drvdata = dev_get_drvdata(dev->parent); - unsigned start, end, val; + unsigned long start, end, val; uint32_t set; int i, bit, reg; - if (sscanf(buf, "%ui %ui %ui", &start, &end, &val) != 3) + if (sscanf(buf, "%lx %lx %lx", &start, &end, &val) != 3) return -EINVAL; if (!test_bit(TPDM_DS_DSB, drvdata->datasets) || (start >= TPDM_DSB_MAX_LINES) || (end >= TPDM_DSB_MAX_LINES)) |