diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:22:26 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 10:22:26 +0200 |
| commit | 37acd687269f8cb8366598e292f96eb5605d3e3a (patch) | |
| tree | e49cc91bef34755b9a279b60ed8d10ea01eec725 /net/caif/chnl_net.c | |
| parent | 79b83b05b07a40c67ac7196555d2b0293cdf26e7 (diff) | |
| parent | 4b64487fa63a71bbed883b55268ea275da6f8a7a (diff) | |
Merge branch 'for-4.18/hid-steam' into for-linus
Valve Steam Controller support from Rodrigo Rivas Costa
Diffstat (limited to 'net/caif/chnl_net.c')
| -rw-r--r-- | net/caif/chnl_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 53ecda10b790..13e2ae6be620 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -174,7 +174,7 @@ static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow, flow == CAIF_CTRLCMD_DEINIT_RSP ? "CLOSE/DEINIT" : flow == CAIF_CTRLCMD_INIT_FAIL_RSP ? "OPEN_FAIL" : flow == CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND ? - "REMOTE_SHUTDOWN" : "UKNOWN CTRL COMMAND"); + "REMOTE_SHUTDOWN" : "UNKNOWN CTRL COMMAND"); |