diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-13 19:42:34 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-13 19:46:02 -0400 |
| commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
| tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /net/caif/cfrfml.c | |
| parent | 550e3b23a53c88adfa46e64f9d442743e65d47da (diff) | |
| parent | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (diff) | |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'net/caif/cfrfml.c')
| -rw-r--r-- | net/caif/cfrfml.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c index 61d7617d9249..b82440e1fcb4 100644 --- a/net/caif/cfrfml.c +++ b/net/caif/cfrfml.c | |||
| @@ -159,7 +159,7 @@ static int cfrfml_receive(struct cflayer *layr, struct cfpkt *pkt) | |||
| 159 | tmppkt = NULL; | 159 | tmppkt = NULL; |
| 160 | 160 | ||
| 161 | /* Verify that length is correct */ | 161 | /* Verify that length is correct */ |
| 162 | err = EPROTO; | 162 | err = -EPROTO; |
| 163 | if (rfml->pdu_size != cfpkt_getlen(pkt) - RFM_HEAD_SIZE + 1) | 163 | if (rfml->pdu_size != cfpkt_getlen(pkt) - RFM_HEAD_SIZE + 1) |
| 164 | goto out; | 164 | goto out; |
| 165 | } | 165 | } |