diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-05 07:17:31 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-05 07:17:31 (GMT) |
| commit | 14e42917216ab0859827c2d8024df45a917301b4 (patch) | |
| tree | efbea5d1c54387d62a6fd66a21560232cf312fda /drivers/infiniband/hw/qib/qib_iba7322.c | |
| parent | 292f2b6254c9dbb98def6d3521b07a837545ead0 (diff) | |
| parent | 4266274836e81575ee82498d84f4bd08ab7a7378 (diff) | |
| download | linux-fsl-qoriq-14e42917216ab0859827c2d8024df45a917301b4.tar.xz | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-next
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba7322.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_iba7322.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c index 0d7280a..3f6b21e 100644 --- a/drivers/infiniband/hw/qib/qib_iba7322.c +++ b/drivers/infiniband/hw/qib/qib_iba7322.c @@ -6346,8 +6346,10 @@ static int qib_init_7322_variables(struct qib_devdata *dd) dd->piobcnt4k * dd->align4k; dd->piovl15base = ioremap_nocache(vl15off, NUM_VL15_BUFS * dd->align4k); - if (!dd->piovl15base) + if (!dd->piovl15base) { + ret = -ENOMEM; goto bail; + } } qib_7322_set_baseaddrs(dd); /* set chip access pointers now */ |