diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-23 15:28:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-23 15:28:23 -0700 |
| commit | 2d0e3734b5842dcffefb5a6bf640f766805cea1e (patch) | |
| tree | 74f38fee1d9612602264ae0e788058ed0c067cf4 /drivers | |
| parent | d448d5bf1ade7ed65becdcb73fed3ecdf379fa72 (diff) | |
| parent | 10bf308dd8e498c7b36aa420f110e6922140e57c (diff) | |
Merge "PM / devfreq: gpubw_mon: Add null check for governor private data"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/devfreq/governor_gpubw_mon.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/devfreq/governor_gpubw_mon.c b/drivers/devfreq/governor_gpubw_mon.c index 8234d30dc644..e121657800ca 100644 --- a/drivers/devfreq/governor_gpubw_mon.c +++ b/drivers/devfreq/governor_gpubw_mon.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2016,2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -213,10 +213,11 @@ static int devfreq_gpubw_event_handler(struct devfreq *devfreq, case DEVFREQ_GOV_SUSPEND: { struct devfreq_msm_adreno_tz_data *priv = devfreq->data; - - priv->bus.total_time = 0; - priv->bus.gpu_time = 0; - priv->bus.ram_time = 0; + if (priv) { + priv->bus.total_time = 0; + priv->bus.gpu_time = 0; + priv->bus.ram_time = 0; + } } break; default: |