aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/slimbus/qcom-ctrl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-05 19:20:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-05 19:20:22 -0400
commitabf7dba7c4f77d781f6df50fefb19a64c5dc331f (patch)
tree38648731b502d5aec508f3b33f6616190e598eb6 /drivers/slimbus/qcom-ctrl.c
parent07c4dd3435aa387d3b58f4e941dc516513f14507 (diff)
parentb23220fe054e92f616b82450fae8cd3ab176cc60 (diff)
Merge tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the "big" char and misc driver patches for 4.18-rc1. It's not a lot of stuff here, but there are some highlights: - coreboot driver updates - soundwire driver updates - android binder updates - fpga big sync, mostly documentation - lots of minor driver updates All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (81 commits) vmw_balloon: fixing double free when batching mode is off MAINTAINERS: Add driver-api/fpga path fpga: clarify that unregister functions also free documentation: fpga: move fpga-region.txt to driver-api documentation: fpga: add bridge document to driver-api documentation: fpga: move fpga-mgr.txt to driver-api Documentation: fpga: move fpga overview to driver-api fpga: region: kernel-doc fixes fpga: bridge: kernel-doc fixes fpga: mgr: kernel-doc fixes fpga: use SPDX fpga: region: change api, add fpga_region_create/free fpga: bridge: change api, don't use drvdata fpga: manager: change api, don't use drvdata fpga: region: don't use drvdata in common fpga code Drivers: hv: vmbus: Removed an unnecessary cast from void * ver_linux: Drop redundant calls to system() to test if file is readable ver_linux: Move stderr redirection from function parameter to function body misc: IBM Virtual Management Channel Driver (VMC) rpmsg: Correct support for MODULE_DEVICE_TABLE() ...
Diffstat (limited to 'drivers/slimbus/qcom-ctrl.c')
-rw-r--r--drivers/slimbus/qcom-ctrl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
index ffb46f915334..bb36a8fbc9b1 100644
--- a/drivers/slimbus/qcom-ctrl.c
+++ b/drivers/slimbus/qcom-ctrl.c
@@ -439,13 +439,12 @@ static int slim_get_current_rxbuf(struct qcom_slim_ctrl *ctrl, void *buf)
439static void qcom_slim_rxwq(struct work_struct *work) 439static void qcom_slim_rxwq(struct work_struct *work)
440{ 440{
441 u8 buf[SLIM_MSGQ_BUF_LEN]; 441 u8 buf[SLIM_MSGQ_BUF_LEN];
442 u8 mc, mt, len; 442 u8 mc, mt;
443 int ret; 443 int ret;
444 struct qcom_slim_ctrl *ctrl = container_of(work, struct qcom_slim_ctrl, 444 struct qcom_slim_ctrl *ctrl = container_of(work, struct qcom_slim_ctrl,
445 wd); 445 wd);
446 446
447 while ((slim_get_current_rxbuf(ctrl, buf)) != -ENODATA) { 447 while ((slim_get_current_rxbuf(ctrl, buf)) != -ENODATA) {
448 len = SLIM_HEADER_GET_RL(buf[0]);
449 mt = SLIM_HEADER_GET_MT(buf[0]); 448 mt = SLIM_HEADER_GET_MT(buf[0]);
450 mc = SLIM_HEADER_GET_MC(buf[1]); 449 mc = SLIM_HEADER_GET_MC(buf[1]);
451 if (mt == SLIM_MSG_MT_CORE && 450 if (mt == SLIM_MSG_MT_CORE &&