]> git.neil.brown.name Git - history.git/commitdiff
Revert fb_ioctl "fix" with extreme prejudice.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 21 Apr 2004 05:02:58 +0000 (22:02 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 21 Apr 2004 05:02:58 +0000 (22:02 -0700)
As Arjan points out, the patch does exactly the opposite
of what it was claimed to do.

Andrea: tssk tssk.

Cset exclude: akpm@osdl.org[torvalds]|ChangeSet|20040421144431|15930

drivers/video/fbmem.c

index 43ccc04c828c94554d3da1307787cbee9bc542b2..5e28466497693037ed8a077dc3561b49fcf0e2e9 100644 (file)
@@ -1037,7 +1037,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
        case FBIOPUTCMAP:
                if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
                        return -EFAULT;
-               return (fb_set_cmap(&cmap, 1, info));
+               return (fb_set_cmap(&cmap, 0, info));
        case FBIOGETCMAP:
                if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
                        return -EFAULT;