summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/tegra/host/dev.c')
-rw-r--r--drivers/video/tegra/host/dev.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c
index fa8c6176fcbc..b2575860e91b 100644
--- a/drivers/video/tegra/host/dev.c
+++ b/drivers/video/tegra/host/dev.c
@@ -1072,7 +1072,8 @@ static int __exit nvhost_remove(struct nvhost_device *dev)
static int nvhost_suspend(struct nvhost_device *dev, pm_message_t state)
{
struct nvhost_master *host = nvhost_get_drvdata(dev);
- int i, ret;
+ int i, ret = 0;
+
dev_info(&dev->dev, "suspending\n");
for (i = 0; i < host->nb_channels; i++) {
@@ -1083,6 +1084,7 @@ static int nvhost_suspend(struct nvhost_device *dev, pm_message_t state)
ret = nvhost_module_suspend(host->dev, true);
dev_info(&dev->dev, "suspend status: %d\n", ret);
+
return ret;
}
@@ -1105,14 +1107,7 @@ static struct nvhost_driver nvhost_driver = {
static int __init nvhost_mod_init(void)
{
- int err;
-
register_sets = tegra_gpu_register_sets();
-
- err = nvhost_device_register(&tegra_grhost_device);
- if (err)
- return err;
-
return nvhost_driver_register(&nvhost_driver);
}