]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: host: vi: Add pdata null check
authorSudhir Vyas <svyas@nvidia.com>
Thu, 13 Feb 2014 13:32:48 +0000 (19:02 +0530)
committerBharat Nihalani <bnihalani@nvidia.com>
Tue, 18 Feb 2014 02:50:17 +0000 (18:50 -0800)
Return proper error code in case of null platform data.

Bug 1454233

Change-Id: Ied4d51154e79946a88de2e375c47b14c0624414a
Signed-off-by: Sudhir Vyas <svyas@nvidia.com>
Reviewed-on: http://git-master/r/367181
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
drivers/video/tegra/host/vi/tegra_vi.c

index bb246345b2a11ce3213434f4419e8b7af14cce17..965b2406a7963fe721d62de019861c729db88c5e 100644 (file)
@@ -210,8 +210,18 @@ static int vi_set_la(struct vi *tegra_vi1, uint vi_bw)
        else
                pdata_vi2 = (struct nvhost_device_data *)pdata_vi1->slave;
 
+       if (!pdata_vi2) {
+               mutex_unlock(&la_lock);
+               return -ENODEV;
+       }
+
        tegra_vi2 = (struct vi *)pdata_vi2->private_data;
 
+       if (!tegra_vi2) {
+               mutex_unlock(&la_lock);
+               return -ENODATA;
+       }
+
        clk_vi = clk_get(&tegra_vi2->ndev->dev, "emc");
        if (tegra_is_clk_enabled(clk_vi))
                total_vi_bw += tegra_vi2->vi_bw;