summaryrefslogtreecommitdiff
path: root/drivers/mailbox
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-08-15 09:16:58 +0300
committerDave Airlie <airlied@redhat.com>2017-08-15 09:16:58 +0300
commit0c697fafc66830ca7d5dc19123a1d0641deaa1f6 (patch)
treec56336719ca8de16f78ada78e606dffa471e47d5 /drivers/mailbox
parent09ef2378dc42339f3871584dc26d27da220277cb (diff)
parentef954844c7ace62f773f4f23e28d2d915adc419f (diff)
downloadlinux-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.tar.xz
Backmerge tag 'v4.13-rc5' into drm-next
Linux 4.13-rc5 There's a really nasty nouveau collision, hopefully someone can take a look once I pushed this out.
Diffstat (limited to 'drivers/mailbox')
-rw-r--r--drivers/mailbox/pcc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index ac91fd0d62c6..cbca5e51b975 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -92,7 +92,7 @@ static struct mbox_controller pcc_mbox_ctrl = {};
*/
static struct mbox_chan *get_pcc_channel(int id)
{
- if (id < 0 || id > pcc_mbox_ctrl.num_chans)
+ if (id < 0 || id >= pcc_mbox_ctrl.num_chans)
return ERR_PTR(-ENOENT);
return &pcc_mbox_channels[id];