Pull misc-for-upstream into release branch

[pandora-kernel.git] / drivers / char / lcd.c

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 7d49b24..d649abb 100644 (file)
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -459,7 +459,7 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
                            (&display, (struct lcd_display *) arg,
                             sizeof(struct lcd_display)))
                                return -EFAULT;
-                       rom = (unsigned char *) kmalloc((128), GFP_ATOMIC);
+                       rom = kmalloc((128), GFP_ATOMIC);
                        if (rom == NULL) {
                                printk(KERN_ERR LCD "kmalloc() failed in %s\n",
                                                __FUNCTION__);
@@ -598,7 +598,7 @@ static ssize_t lcd_read(struct file *file, char *buf,
  *     The various file operations we support.
  */
 
-static struct file_operations lcd_fops = {
+static const struct file_operations lcd_fops = {
        .read = lcd_read,
        .ioctl = lcd_ioctl,
        .open = lcd_open,