diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-30 15:26:55 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-30 15:26:55 +0000 |
| commit | c491b0c9b2c06239f268cb309083eb21c53e4286 (patch) | |
| tree | 0ba93ab4a238fdcd18ff0629201d819dae3326cb /packages/linux/linux-2.6.18/lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch | |
| parent | f0ade73c77036bea989835d91e38af494a1b26d9 (diff) | |
| parent | e49ed8da00b7a5d874fd92a806c6b036a726069c (diff) | |
propagate from branch 'org.openembedded.dev' (head 968e6781dca5ee420f8b36434c88d54cafe77f35)
to branch 'org.openembedded.dev.avr32' (head facce641a6e2c90f8a2171880eafb72136895681)
Diffstat (limited to 'packages/linux/linux-2.6.18/lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch')
| -rw-r--r-- | packages/linux/linux-2.6.18/lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/packages/linux/linux-2.6.18/lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch b/packages/linux/linux-2.6.18/lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch new file mode 100644 index 0000000000..fea5d6cf80 --- /dev/null +++ b/packages/linux/linux-2.6.18/lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch @@ -0,0 +1,38 @@ +Index: linux-2.6.18/drivers/video/sidsafb.c +=================================================================== +--- linux-2.6.18.orig/drivers/video/sidsafb.c 2007-01-11 13:35:02.000000000 +0100 ++++ linux-2.6.18/drivers/video/sidsafb.c 2007-01-11 14:22:56.000000000 +0100 +@@ -661,6 +661,7 @@ + struct fb_info *info; + struct sidsafb_info *sinfo; + const struct resource *mmio_resource; ++ int preinitialized = 0; + int ret; + + pr_debug("sidsafb_probe BEGIN\n"); +@@ -681,7 +682,7 @@ + sinfo = info->par; + sinfo->info = info; + sinfo->pdev = pdev; +- sinfo->guard_time = 1; ++ sinfo->guard_time = 2; + + spin_lock_init(&sinfo->lock); + sidsafb_set_fbinfo(sinfo); +@@ -711,6 +712,7 @@ + info->fix.smem_len = fb_data->fbmem_size; + info->screen_base = ioremap(info->fix.smem_start, + info->fix.smem_len); ++ preinitialized = 1; + } else { + dma_addr_t paddr; + +@@ -767,7 +769,7 @@ + + /* Only clear framebuffer if fbmem_start was not declared, assume the + * user have filled the framebuffer before the kernel was started. */ +- if (!fb_data->fbmem_start) ++ if (!preinitialized) + memset_io(info->screen_base, 0, info->fix.smem_len); + info->var.activate |= FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW; + ret = fb_set_var(info, &info->var); |