From 7432e4bd0bcec9f18d9c94de8925b8a59d3edf94 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Thu, 29 Oct 2009 14:19:42 -0700 Subject: xen/xenbus: clean up error handling Don't report errors when booting on non-Xen, because its just confusing. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 8aa08376d6aa in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/xenbus/xenbus_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/xen/xenbus') diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index b09eb17ba007..96bd1ef61ebe 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -242,7 +242,7 @@ int xenbus_dev_probe(struct device *_dev) fail: xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename); xenbus_switch_state(dev, XenbusStateClosed); - return -ENODEV; + return err; } EXPORT_SYMBOL_GPL(xenbus_dev_probe); @@ -709,7 +709,7 @@ static int __init xenbus_init(void) err = -ENODEV; if (!xen_domain()) - goto out_error; + return err; /* * Domain0 doesn't have a store_evtchn or store_mfn yet. -- cgit v1.2.3