From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@transmeta.com>,
Ben Collins <bcollins@debian.org>
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH] Atari Atyfb fixes
Date: Sun, 11 May 2003 12:30:11 +0200 [thread overview]
Message-ID: <200305111030.h4BAUBhO019633@callisto.of.borg> (raw)
Atyfb fixes for Atari (got reversed in 2.5.69):
- Add missing allocation of default_par
- Kill warnings in assignments
--- linux-2.5.x/drivers/video/aty/atyfb_base.c Mon Feb 10 21:59:19 2003
+++ linux-m68k-2.5.x/drivers/video/aty/atyfb_base.c Tue Feb 25 18:31:27 2003
@@ -2319,15 +2319,25 @@
return -ENOMEM;
}
memset(info, 0, sizeof(struct fb_info));
- info->fix = atyfb_fix;
+
+ default_par = kmalloc(sizeof(struct atyfb_par), GFP_ATOMIC);
+ if (!default_par) {
+ printk
+ ("atyfb_init: can't alloc atyfb_par\n");
+ kfree(info);
+ return -ENXIO;
+ }
+ memset(default_par, 0, sizeof(struct atyfb_par));
+
+ info->fix = atyfb_fix;
/*
* Map the video memory (physical address given) to somewhere in the
* kernel address space.
*/
- info->screen_base = (unsigned long)ioremap(phys_vmembase[m64_num],
+ info->screen_base = ioremap(phys_vmembase[m64_num],
phys_size[m64_num]);
- info->fix.smem_start = info->screen_base; /* Fake! */
+ info->fix.smem_start = (unsigned long)info->screen_base; /* Fake! */
default_par->ati_regbase = (unsigned long)ioremap(phys_guiregbase[m64_num],
0x10000) + 0xFC00ul;
info->fix.mmio_start = default_par->ati_regbase; /* Fake! */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next reply other threads:[~2003-05-11 10:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-11 10:30 Geert Uytterhoeven [this message]
2003-05-11 15:16 ` [PATCH] Atari Atyfb fixes Ben Collins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200305111030.h4BAUBhO019633@callisto.of.borg \
--to=geert@linux-m68k.org \
--cc=bcollins@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).