projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
[cascardo/linux.git]
/
drivers
/
video
/
au1200fb.c
diff --git
a/drivers/video/au1200fb.c
b/drivers/video/au1200fb.c
index
600d3e0
..
03e57ef
100644
(file)
--- a/
drivers/video/au1200fb.c
+++ b/
drivers/video/au1200fb.c
@@
-1545,7
+1545,7
@@
static struct fb_ops au1200fb_fb_ops = {
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id
, struct pt_regs *regs
)
+static irqreturn_t au1200fb_handle_irq(int irq, void* dev_id)
{
/* Nothing to do for now, just clear any pending interrupt */
lcd->intstatus = lcd->intstatus;
{
/* Nothing to do for now, just clear any pending interrupt */
lcd->intstatus = lcd->intstatus;
@@
-1589,11
+1589,10
@@
static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
return -EFAULT;
}
return -EFAULT;
}
- fbi->pseudo_palette = k
malloc(sizeof(u32) * 16
, GFP_KERNEL);
+ fbi->pseudo_palette = k
calloc(16, sizeof(u32)
, GFP_KERNEL);
if (!fbi->pseudo_palette) {
return -ENOMEM;
}
if (!fbi->pseudo_palette) {
return -ENOMEM;
}
- memset(fbi->pseudo_palette, 0, sizeof(u32) * 16);
if (fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
print_err("Fail to allocate colormap (%d entries)",
if (fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
print_err("Fail to allocate colormap (%d entries)",
@@
-1694,7
+1693,7
@@
static int au1200fb_drv_probe(struct device *dev)
/* Now hook interrupt too */
if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
/* Now hook interrupt too */
if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
-
SA_INTERRUPT | SA_SHIRQ
, "lcd", (void *)dev)) < 0) {
+
IRQF_DISABLED | IRQF_SHARED
, "lcd", (void *)dev)) < 0) {
print_err("fail to request interrupt line %d (err: %d)",
AU1200_LCD_INT, ret);
goto failed;
print_err("fail to request interrupt line %d (err: %d)",
AU1200_LCD_INT, ret);
goto failed;