diff options
| author | Xia Yang <xiay@nvidia.com> | 2013-11-12 18:24:14 -0800 |
|---|---|---|
| committer | Jon Mayo <jmayo@nvidia.com> | 2014-03-17 09:13:10 -0700 |
| commit | 01ad4043f32cad4880522aa4c4dac06260a0b440 (patch) | |
| tree | 7a295a679095752dcbd69a97e3e9087f0c9959be /drivers/video/tegra/dc/dc.c | |
| parent | 84581936d0ed5c40fdf3d2f70d912568415f82af (diff) | |
video: tegra: fb: Remove redundant modelist adding
Fix modelist initializing in tegra_fb_register().
Remove redundant modelist adding in tegra_dc_probe()
which will cause NULL pointer dereferencing in ADF code path.
Bug 1425201
Bug 1459374
Change-Id: Ia9f31552a74743f62a3e641ed3d3571a7ffd4ece
Signed-off-by: Xia Yang <xiay@nvidia.com>
Reviewed-on: http://git-master/r/355333
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index c45c739183af..1d41849af41f 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -2647,27 +2647,6 @@ static ssize_t switch_modeset_print_mode(struct switch_dev *sdev, char *buf) } #endif -static void tegra_dc_add_modes(struct tegra_dc *dc) -{ - struct fb_monspecs specs; - int i; - - memset(&specs, 0, sizeof(specs)); - specs.max_x = dc->mode.h_active * 1000; - specs.max_y = dc->mode.v_active * 1000; - specs.modedb_len = dc->out->n_modes; - specs.modedb = kzalloc(specs.modedb_len * - sizeof(struct fb_videomode), GFP_KERNEL); - if (specs.modedb == NULL) { - dev_err(&dc->ndev->dev, "modedb allocation failed\n"); - return; - } - for (i = 0; i < dc->out->n_modes; i++) - tegra_dc_to_fb_videomode(&specs.modedb[i], - &dc->out->modes[i]); - tegra_fb_update_monspecs(dc->fb, &specs, NULL); -} - static int tegra_dc_probe(struct platform_device *ndev) { struct tegra_dc *dc; @@ -3005,9 +2984,6 @@ static int tegra_dc_probe(struct platform_device *ndev) } } - if (dc->out && dc->out->n_modes) - tegra_dc_add_modes(dc); - if (dc->out && dc->out->hotplug_init) dc->out->hotplug_init(&ndev->dev); |