[Xen-devel] [PATCH -next] xen/evtchn_fifo: fix error return code in evtchn_fifo_setup()

[Wei Yongjun <weiyj.lk@xxxxxxxxx>]

From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>

Fix to return -ENOMEM from the error handling case instead of
0 (overwrited to 0 by the HYPERVISOR_event_channel_op call),
otherwise the error condition cann't be reflected from the
return value.

Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
---
 drivers/xen/events/events_fifo.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c
index e2bf957..89e4893 100644
--- a/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@ -109,7 +109,7 @@ static int evtchn_fifo_setup(struct irq_info *info)
 {
        unsigned port = info->evtchn;
        unsigned new_array_pages;
-       int ret = -ENOMEM;
+       int ret;
 
        new_array_pages = port / EVENT_WORDS_PER_PAGE + 1;
 
@@ -124,8 +124,10 @@ static int evtchn_fifo_setup(struct irq_info *info)
                array_page = event_array[event_array_pages];
                if (!array_page) {
                        array_page = (void *)__get_free_page(GFP_KERNEL);
-                       if (array_page == NULL)
+                       if (array_page == NULL) {
+                               ret = -ENOMEM;
                                goto error;
+                       }
                        event_array[event_array_pages] = array_page;
                }
 


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel