diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-10-29 14:19:42 -0700 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-01-05 16:30:37 -0500 |
| commit | 7432e4bd0bcec9f18d9c94de8925b8a59d3edf94 (patch) | |
| tree | 8506ae41ca15e8d21e2d78c115f89784a6282a4b | |
| parent | 1b31a143450ea9b5e6168f3b21a02c4a6a63ad01 (diff) | |
| download | op-kernel-dev-7432e4bd0bcec9f18d9c94de8925b8a59d3edf94.zip op-kernel-dev-7432e4bd0bcec9f18d9c94de8925b8a59d3edf94.tar.gz | |
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>
| -rw-r--r-- | drivers/xen/xenbus/xenbus_probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index b09eb17..96bd1ef 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. |
