diff options
Diffstat (limited to 'drivers/amba/bus.c')
| -rw-r--r-- | drivers/amba/bus.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 3b0118786b43..41b706403ef7 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -102,8 +102,8 @@ static ssize_t driver_override_store(struct device *_dev, if (strlen(driver_override)) { dev->driver_override = driver_override; } else { - kfree(driver_override); - dev->driver_override = NULL; + kfree(driver_override); + dev->driver_override = NULL; } device_unlock(_dev); @@ -205,6 +205,7 @@ struct bus_type amba_bustype = { .dma_configure = platform_dma_configure, .pm = &amba_pm, }; +EXPORT_SYMBOL_GPL(amba_bustype); static int __init amba_init(void) { @@ -251,7 +252,7 @@ static int amba_probe(struct device *dev) break; ret = dev_pm_domain_attach(dev, true); - if (ret == -EPROBE_DEFER) + if (ret) break; ret = amba_get_enable_pclk(pcdev); @@ -378,7 +379,7 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) } ret = dev_pm_domain_attach(&dev->dev, true); - if (ret == -EPROBE_DEFER) { + if (ret) { iounmap(tmp); goto err_release; } |
