]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6294fb1) | patch
ath10k: fix a conflict bug in wmi service bitmap
authorMichal Kazior <michal.kazior@tieto.com>
Tue, 19 Aug 2014 11:22:32 +0000 (13:22 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 25 Aug 2014 08:21:49 +0000 (11:21 +0300)
commit22a238ee2ba896686cdbdde10edc709de902c38e
treea48c8a1dafca4ff9119ee141f341afd67f858e91tree | snapshot
parent6294fb18dba378c1f01a2da692a1142775bf9854commit | diff
ath10k: fix a conflict bug in wmi service bitmap

Service mapping for main firmware branch was incorrectly used for 10.x firmware
and vice-versa.  This caused wmi_services in debugfs to print wrong values.

This fixes commit 65529e07c11a6 ("ath10k: fix wmi service bitmap debug") where
for some reason there was either a conflict that wasn't resolved properly or
git had a bad day.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/wmi.c diff | blob | history
Linux Kernel Source Tree.