git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
[pandora-kernel.git]
/
drivers
/
video
/
aty
/
radeon_base.c
diff --git
a/drivers/video/aty/radeon_base.c
b/drivers/video/aty/radeon_base.c
index
c9f0c5a
..
387a18a
100644
(file)
--- a/
drivers/video/aty/radeon_base.c
+++ b/
drivers/video/aty/radeon_base.c
@@
-1067,7
+1067,7
@@
static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
if (regno > 255)
if (regno > 255)
- return
1
;
+ return
-EINVAL
;
red >>= 8;
green >>= 8;
red >>= 8;
green >>= 8;
@@
-1086,9
+1086,9
@@
static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
pindex = regno * 8;
if (rinfo->depth == 16 && regno > 63)
pindex = regno * 8;
if (rinfo->depth == 16 && regno > 63)
- return
1
;
+ return
-EINVAL
;
if (rinfo->depth == 15 && regno > 31)
if (rinfo->depth == 15 && regno > 31)
- return
1
;
+ return
-EINVAL
;
/* For 565, the green component is mixed one order
* below
/* For 565, the green component is mixed one order
* below
@@
-2265,7
+2265,7
@@
static struct bin_attribute edid2_attr = {
};
};
-static int radeonfb_pci_register (struct pci_dev *pdev,
+static int
__devinit
radeonfb_pci_register (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct fb_info *info;
const struct pci_device_id *ent)
{
struct fb_info *info;