xen/xenbus: clean up error handling

Don't report errors when booting on non-Xen, because its just confusing.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
[corresponds to 8aa08376d6aa in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index b09eb17ba007134ed8a72270b79b21a7a2753b0d..96bd1ef61ebee536480af99b906bc3874b42f269 100644 (file)
--- 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.