diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-07 21:45:20 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-07 21:45:20 +0300 |
| commit | 65f619d2535197d97067eeeef75a40f25b552e69 (patch) | |
| tree | 13f96c51a2b591ed22f1771541998bb77178f685 /drivers/hwtracing/intel_th/core.c | |
| parent | fbbaf700e7b163a0f1704b2d542ee28be11fce21 (diff) | |
| parent | 6d8c6c0f97ad8a3517c42b179c1dc8e77397d0e2 (diff) | |
| download | linux-65f619d2535197d97067eeeef75a40f25b552e69.tar.xz | |
Merge branch 'for-linus' into for-4.12/block
We've added a considerable amount of fixes for stalls and issues
with the blk-mq scheduling in the 4.11 series since forking
off the for-4.12/block branch. We need to do improvements on
top of that for 4.12, so pull in the previous fixes to make
our lives easier going forward.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/hwtracing/intel_th/core.c')
| -rw-r--r-- | drivers/hwtracing/intel_th/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c index cdd9b3b26195..7563eceeaaea 100644 --- a/drivers/hwtracing/intel_th/core.c +++ b/drivers/hwtracing/intel_th/core.c @@ -221,8 +221,10 @@ static int intel_th_output_activate(struct intel_th_device *thdev) else intel_th_trace_enable(thdev); - if (ret) + if (ret) { pm_runtime_put(&thdev->dev); + module_put(thdrv->driver.owner); + } return ret; } |