diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-22 10:28:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-22 10:28:38 +0100 |
| commit | e1c51aa8705fd78e5259e0515aad3b5003e18550 (patch) | |
| tree | 3728628142a24460d6b488e5331f421f902e5d3a /drivers/video/fbdev/udlfb.c | |
| parent | 6e49b7fa3083c30688b7fff1b37ed891cd1c30af (diff) | |
| parent | 08556e03ad36b2c6219aba90de88ccf58038e208 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linaro-lsk-v4.9-rt-test
Diffstat (limited to 'drivers/video/fbdev/udlfb.c')
| -rw-r--r-- | drivers/video/fbdev/udlfb.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index 53326badfb61..2add8def83be 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1487,15 +1487,25 @@ static struct device_attribute fb_device_attrs[] = { static int dlfb_select_std_channel(struct dlfb_data *dev) { int ret; - u8 set_def_chn[] = { 0x57, 0xCD, 0xDC, 0xA7, + void *buf; + static const u8 set_def_chn[] = { + 0x57, 0xCD, 0xDC, 0xA7, 0x1C, 0x88, 0x5E, 0x15, 0x60, 0xFE, 0xC6, 0x97, 0x16, 0x3D, 0x47, 0xF2 }; + buf = kmemdup(set_def_chn, sizeof(set_def_chn), GFP_KERNEL); + + if (!buf) + return -ENOMEM; + ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), NR_USB_REQUEST_CHANNEL, (USB_DIR_OUT | USB_TYPE_VENDOR), 0, 0, - set_def_chn, sizeof(set_def_chn), USB_CTRL_SET_TIMEOUT); + buf, sizeof(set_def_chn), USB_CTRL_SET_TIMEOUT); + + kfree(buf); + return ret; } |