Skip to content

Commit

Permalink
Merge branches 'pm-devfreq-fixes' and 'pm-cpufreq-fixes'
Browse files Browse the repository at this point in the history
* pm-devfreq-fixes:
  PM / devfreq: Send the DEVFREQ_POSTCHANGE notification when target() is failed
  PM / devfreq: fix initialization of current frequency in last status
  PM / devfreq: exynos-nocp: Remove incorrect IS_ERR() check
  PM / devfreq: remove double put_device
  PM / devfreq: fix double call put_device
  PM / devfreq: fix duplicated kfree on devfreq pointer
  PM / devfreq: devm_kzalloc to have dev pointer more precisely

* pm-cpufreq-fixes:
  cpufreq: pcc-cpufreq: Fix doorbell.access_width
  • Loading branch information
Rafael J. Wysocki committed Jun 24, 2016
2 parents 0d37189 + 3c67a82 commit e753f30
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/cpufreq/pcc-cpufreq.c
Original file line number Diff line number Diff line change
@@ -487,7 +487,7 @@ static int __init pcc_cpufreq_probe(void)
doorbell.space_id = reg_resource->space_id;
doorbell.bit_width = reg_resource->bit_width;
doorbell.bit_offset = reg_resource->bit_offset;
doorbell.access_width = 64;
doorbell.access_width = 4;
doorbell.address = reg_resource->address;

pr_debug("probe: doorbell: space_id is %d, bit_width is %d, "

0 comments on commit e753f30

Please sign in to comment.