diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-07-29 09:42:21 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-03-17 17:03:05 -0600 |
| commit | 8646c2d478d1a512b0d51909fd494f12dc46606b (patch) | |
| tree | 5781130f058a4afbcdc04c2a8561f8b74a7d3587 /drivers | |
| parent | 782815523abf6256b09f8c490814bbc9e3743658 (diff) | |
UBUNTU: SAUCE: (no-up) Modularize vesafb -- fix initialisation
When this patch was rolled forward, likely between Dapper and Hardy
a chunk of initialisation was lost. Pull this back in so we actually
have an vesafb_info structure initialised. Else we may well panic when
we rmmod vesafb.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/vesafb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 97af4869c5a..e3acd0131ee 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -258,6 +258,7 @@ static int __init vesafb_setup(char *options) static int __init vesafb_probe(struct platform_device *dev) { struct fb_info *info; + struct vesafb_info *vfb_info; int i, err; unsigned int size_vmode; unsigned int size_remap; @@ -316,13 +317,14 @@ static int __init vesafb_probe(struct platform_device *dev) spaces our resource handlers simply don't know about */ } - info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev); + info = framebuffer_alloc(sizeof(struct vesafb_info), &dev->dev); if (!info) { release_mem_region(vesafb_fix.smem_start, size_total); return -ENOMEM; } - info->pseudo_palette = info->par; - info->par = NULL; + vfb_info = (struct vesafb_info *) info->par; + vfb_info->mtrr_hdl = -1; + info->pseudo_palette = vfb_info->pseudo_palette; /* set vesafb aperture size for generic probing */ info->apertures = alloc_apertures(1); @@ -452,17 +454,15 @@ static int __init vesafb_probe(struct platform_device *dev) } if (type) { - int rc; - /* Find the largest power-of-two */ temp_size = roundup_pow_of_two(temp_size); /* Try and find a power of two to add */ do { - rc = mtrr_add(vesafb_fix.smem_start, temp_size, + vfb_info->mtrr_hdl = mtrr_add(vesafb_fix.smem_start, temp_size, type, 1); temp_size >>= 1; - } while (temp_size >= PAGE_SIZE && rc == -EINVAL); + } while (temp_size >= PAGE_SIZE && vfb_info->mtrr_hdl == -EINVAL); } } #endif |