diff options
author | David S. Miller <davem@davemloft.net> | 2012-10-16 13:05:25 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-28 10:56:18 -0700 |
commit | 060672c399c00f09d8e238756c1853a4c870b48a (patch) | |
tree | 0e4d01f892e16bc6679e6014507cc0ef225edc12 /drivers/usb/core/devio.c | |
parent | f386dbc80c65fe40a5a76806358a5e565086e23c (diff) |
sparc64: Fix bit twiddling in sparc_pmu_enable_event().
[ Upstream commit e793d8c6740f8fe704fa216e95685f4d92c4c4b9 ]
There was a serious disconnect in the logic happening in
sparc_pmu_disable_event() vs. sparc_pmu_enable_event().
Event disable is implemented by programming a NOP event into the PCR.
However, event enable was not reversing this operation. Instead, it
was setting the User/Priv/Hypervisor trace enable bits.
That's not sparc_pmu_enable_event()'s job, that's what
sparc_pmu_enable() and sparc_pmu_disable() do .
The intent of sparc_pmu_enable_event() is clear, since it first clear
out the event type encoding field. So fix this by OR'ing in the event
encoding rather than the trace enable bits.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/devio.c')
0 files changed, 0 insertions, 0 deletions