diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
| commit | f4845bd61300c2b5013bd4fa28c83975a85069bc (patch) | |
| tree | 974925d5ec1d615a748d37dab2e41c823e38f5c5 /drivers/net/xen-netback/xenbus.c | |
| parent | 3985b18650bf2365debb142624f877007b31ada2 (diff) | |
| parent | a852cc89cffb65272be77785b9eb2682e38ed53f (diff) | |
Merge branch 'tracking-ilp32' into merge-linux-linaro-extralinux-linaro-extra-20151104.0linux-linaro-extra
Diffstat (limited to 'drivers/net/xen-netback/xenbus.c')
| -rw-r--r-- | drivers/net/xen-netback/xenbus.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 929a6e7e5ecf..56ebd8267386 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -788,6 +788,12 @@ static void connect(struct backend_info *be) /* Use the number of queues requested by the frontend */ be->vif->queues = vzalloc(requested_num_queues * sizeof(struct xenvif_queue)); + if (!be->vif->queues) { + xenbus_dev_fatal(dev, -ENOMEM, + "allocating queues"); + return; + } + be->vif->num_queues = requested_num_queues; be->vif->stalled_queues = requested_num_queues; |