Merge branches 'sh/g3-prep' and 'sh/stable-updates'

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index 1d8e39a557d9..1eb9e4162cc6 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -60,6 +60,7 @@
 static struct usb_device_id appledisplay_table [] = {
         { APPLEDISPLAY_DEVICE(0x9218) },
         { APPLEDISPLAY_DEVICE(0x9219) },
+        { APPLEDISPLAY_DEVICE(0x921c) },
         { APPLEDISPLAY_DEVICE(0x921d) },
 
         /* Terminating entry */
@@ -72,8 +73,8 @@ struct appledisplay {
         struct usb_device *udev;        /* usb device */
         struct urb *urb;                /* usb request block */
         struct backlight_device *bd;    /* backlight device */
-        char *urbdata;                  /* interrupt URB data buffer */
-        char *msgdata;                  /* control message data buffer */
+        u8 *urbdata;                    /* interrupt URB data buffer */
+        u8 *msgdata;                    /* control message data buffer */
 
         struct delayed_work work;
         int button_pressed;