diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2016-09-23 14:57:16 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-23 14:57:16 +0200 |
| commit | 0565f49cfe937640c2347f6d7f40ad2f4e4f088b (patch) | |
| tree | 6067447df39c37946bc2de3ee004f45957bf123e /drivers/rapidio/devices/tsi721.c | |
| parent | Merge branch 'gpio-irq-validmask' into devel (diff) | |
| parent | Linux 4.8-rc6 (diff) | |
| download | linux-dev-0565f49cfe937640c2347f6d7f40ad2f4e4f088b.tar.xz linux-dev-0565f49cfe937640c2347f6d7f40ad2f4e4f088b.zip | |
Merge tag 'v4.8-rc6' into devel
Linux 4.8-rc6
Diffstat (limited to 'drivers/rapidio/devices/tsi721.c')
| -rw-r--r-- | drivers/rapidio/devices/tsi721.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index 32f0f014a067..9d19b9a62011 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c @@ -1161,7 +1161,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart, } else if (ibw_start < (ib_win->rstart + ib_win->size) && (ibw_start + ibw_size) > ib_win->rstart) { /* Return error if address translation involved */ - if (direct && ib_win->xlat) { + if (!direct || ib_win->xlat) { ret = -EFAULT; break; } |