|
@@ -304,13 +304,14 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
|
|
|
if (IS_ERR(priv->regs)) {
|
|
|
dev_err(dev, "%s failed mmio\n", __func__);
|
|
|
ret = PTR_ERR(priv->regs);
|
|
|
- goto dev_unref;
|
|
|
+ goto dev_put;
|
|
|
}
|
|
|
|
|
|
/* This may override some variant settings */
|
|
|
ret = pl111_versatile_init(dev, priv);
|
|
|
if (ret)
|
|
|
- goto dev_unref;
|
|
|
+ goto dev_put;
|
|
|
+
|
|
|
pl111_nomadik_init(dev);
|
|
|
|
|
|
/* turn off interrupts before requesting the irq */
|
|
@@ -325,16 +326,16 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
|
|
|
|
|
|
ret = pl111_modeset_init(drm);
|
|
|
if (ret != 0)
|
|
|
- goto dev_unref;
|
|
|
+ goto dev_put;
|
|
|
|
|
|
ret = drm_dev_register(drm, 0);
|
|
|
if (ret < 0)
|
|
|
- goto dev_unref;
|
|
|
+ goto dev_put;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-dev_unref:
|
|
|
- drm_dev_unref(drm);
|
|
|
+dev_put:
|
|
|
+ drm_dev_put(drm);
|
|
|
of_reserved_mem_device_release(dev);
|
|
|
|
|
|
return ret;
|
|
@@ -351,7 +352,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev)
|
|
|
if (priv->panel)
|
|
|
drm_panel_bridge_remove(priv->bridge);
|
|
|
drm_mode_config_cleanup(drm);
|
|
|
- drm_dev_unref(drm);
|
|
|
+ drm_dev_put(drm);
|
|
|
of_reserved_mem_device_release(dev);
|
|
|
|
|
|
return 0;
|