* [patch] coresight-etm: unlock on error paths in mode_store()
@ 2014-11-12 11:22 Dan Carpenter
2014-11-13 18:11 ` Mathieu Poirier
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2014-11-12 11:22 UTC (permalink / raw)
To: linux-arm-kernel
There are some missing unlocks on the error paths.
Fixes: a939fc5a71ad ('coresight-etm: add CoreSight ETM/PTM driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
I don't have a cross compiler set up so I haven't compiled this. But
I think it doesn't have any typos. :)
diff --git a/drivers/coresight/coresight-etm3x.c b/drivers/coresight/coresight-etm3x.c
index d9e3ed6..369cac0 100644
--- a/drivers/coresight/coresight-etm3x.c
+++ b/drivers/coresight/coresight-etm3x.c
@@ -573,7 +573,8 @@ static ssize_t mode_store(struct device *dev,
if (drvdata->mode & ETM_MODE_STALL) {
if (!(drvdata->etmccr & ETMCCR_FIFOFULL)) {
dev_warn(drvdata->dev, "stall mode not supported\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_unlock;
}
drvdata->ctrl |= ETMCR_STALL_MODE;
} else
@@ -582,7 +583,8 @@ static ssize_t mode_store(struct device *dev,
if (drvdata->mode & ETM_MODE_TIMESTAMP) {
if (!(drvdata->etmccer & ETMCCER_TIMESTAMP)) {
dev_warn(drvdata->dev, "timestamp not supported\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_unlock;
}
drvdata->ctrl |= ETMCR_TIMESTAMP_EN;
} else
@@ -595,6 +597,10 @@ static ssize_t mode_store(struct device *dev,
spin_unlock(&drvdata->spinlock);
return size;
+
+err_unlock:
+ spin_unlock(&drvdata->spinlock);
+ return ret;
}
static DEVICE_ATTR_RW(mode);
^ permalink raw reply related [flat|nested] 2+ messages in thread* [patch] coresight-etm: unlock on error paths in mode_store()
2014-11-12 11:22 [patch] coresight-etm: unlock on error paths in mode_store() Dan Carpenter
@ 2014-11-13 18:11 ` Mathieu Poirier
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Poirier @ 2014-11-13 18:11 UTC (permalink / raw)
To: linux-arm-kernel
On 12 November 2014 04:22, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> There are some missing unlocks on the error paths.
>
> Fixes: a939fc5a71ad ('coresight-etm: add CoreSight ETM/PTM driver')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> I don't have a cross compiler set up so I haven't compiled this. But
> I think it doesn't have any typos. :)
>
> diff --git a/drivers/coresight/coresight-etm3x.c b/drivers/coresight/coresight-etm3x.c
> index d9e3ed6..369cac0 100644
> --- a/drivers/coresight/coresight-etm3x.c
> +++ b/drivers/coresight/coresight-etm3x.c
> @@ -573,7 +573,8 @@ static ssize_t mode_store(struct device *dev,
> if (drvdata->mode & ETM_MODE_STALL) {
> if (!(drvdata->etmccr & ETMCCR_FIFOFULL)) {
> dev_warn(drvdata->dev, "stall mode not supported\n");
> - return -EINVAL;
> + ret = -EINVAL;
> + goto err_unlock;
> }
> drvdata->ctrl |= ETMCR_STALL_MODE;
> } else
> @@ -582,7 +583,8 @@ static ssize_t mode_store(struct device *dev,
> if (drvdata->mode & ETM_MODE_TIMESTAMP) {
> if (!(drvdata->etmccer & ETMCCER_TIMESTAMP)) {
> dev_warn(drvdata->dev, "timestamp not supported\n");
> - return -EINVAL;
> + ret = -EINVAL;
> + goto err_unlock;
> }
> drvdata->ctrl |= ETMCR_TIMESTAMP_EN;
> } else
> @@ -595,6 +597,10 @@ static ssize_t mode_store(struct device *dev,
> spin_unlock(&drvdata->spinlock);
>
> return size;
> +
> +err_unlock:
> + spin_unlock(&drvdata->spinlock);
> + return ret;
> }
> static DEVICE_ATTR_RW(mode);
>
Applied - thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-13 18:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-12 11:22 [patch] coresight-etm: unlock on error paths in mode_store() Dan Carpenter
2014-11-13 18:11 ` Mathieu Poirier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox