iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'fbdev-v4.12-rc6' of git://github.com/bzolnier/linux

Browse Source 
Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - fix udlfb driver to stop spamming logs (Mike Gerow)

 - add missing endianness conversions in smscufx & udlfb drivers (Johan
   Hovold)

 - fix few gcc warnings/errors (Arnd Bergmann)

* tag 'fbdev-v4.12-rc6' of git://github.com/bzolnier/linux:
  video: fbdev: udlfb: drop log level for blanking
  video: fbdev: via: remove possibly unused variables
  video: fbdev: add missing USB-descriptor endianness conversions
  video: fbdev: avoid int-in-bool-context warning
This commit is contained in:
Linus Torvalds
2017-06-17 06:51:25 +09:00
parent 162f73f4b9 b429f96aa5
commit 3a448294b7
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/fbdev/core/fbmon.c
View File

@ -1048,7 +1048,7 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE; for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE;
i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) i++, block += DETAILED_TIMING_DESCRIPTION_SIZE)
if (PIXEL_CLOCK) if (PIXEL_CLOCK != 0)
edt[num++] = block - edid; edt[num++] = block - edid;
/* Yikes, EDID data is totally useless */ /* Yikes, EDID data is totally useless */

5
drivers/video/fbdev/smscufx.c
View File

@ -1646,8 +1646,9 @@ static int ufx_usb_probe(struct usb_interface *interface,
dev_dbg(dev->gdev, "%s %s - serial #%s\n", dev_dbg(dev->gdev, "%s %s - serial #%s\n",
usbdev->manufacturer, usbdev->product, usbdev->serial); usbdev->manufacturer, usbdev->product, usbdev->serial);
dev_dbg(dev->gdev, "vid_%04x&pid_%04x&rev_%04x driver's ufx_data struct at %p\n", dev_dbg(dev->gdev, "vid_%04x&pid_%04x&rev_%04x driver's ufx_data struct at %p\n",
usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, le16_to_cpu(usbdev->descriptor.idVendor),
usbdev->descriptor.bcdDevice, dev); le16_to_cpu(usbdev->descriptor.idProduct),
le16_to_cpu(usbdev->descriptor.bcdDevice), dev);
dev_dbg(dev->gdev, "console enable=%d\n", console); dev_dbg(dev->gdev, "console enable=%d\n", console);
dev_dbg(dev->gdev, "fb_defio enable=%d\n", fb_defio); dev_dbg(dev->gdev, "fb_defio enable=%d\n", fb_defio);

7
drivers/video/fbdev/udlfb.c
View File

@ -1105,7 +1105,7 @@ static int dlfb_ops_blank(int blank_mode, struct fb_info *info)
char *bufptr; char *bufptr;
struct urb *urb; struct urb *urb;
pr_info("/dev/fb%d FB_BLANK mode %d --> %d\n", pr_debug("/dev/fb%d FB_BLANK mode %d --> %d\n",
info->node, dev->blank_mode, blank_mode); info->node, dev->blank_mode, blank_mode);
if ((dev->blank_mode == FB_BLANK_POWERDOWN) && if ((dev->blank_mode == FB_BLANK_POWERDOWN) &&
@ -1613,8 +1613,9 @@ static int dlfb_usb_probe(struct usb_interface *interface,
pr_info("%s %s - serial #%s\n", pr_info("%s %s - serial #%s\n",
usbdev->manufacturer, usbdev->product, usbdev->serial); usbdev->manufacturer, usbdev->product, usbdev->serial);
pr_info("vid_%04x&pid_%04x&rev_%04x driver's dlfb_data struct at %p\n", pr_info("vid_%04x&pid_%04x&rev_%04x driver's dlfb_data struct at %p\n",
usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, le16_to_cpu(usbdev->descriptor.idVendor),
usbdev->descriptor.bcdDevice, dev); le16_to_cpu(usbdev->descriptor.idProduct),
le16_to_cpu(usbdev->descriptor.bcdDevice), dev);
pr_info("console enable=%d\n", console); pr_info("console enable=%d\n", console);
pr_info("fb_defio enable=%d\n", fb_defio); pr_info("fb_defio enable=%d\n", fb_defio);
pr_info("shadow enable=%d\n", shadow); pr_info("shadow enable=%d\n", shadow);

8
drivers/video/fbdev/via/viafbdev.c
View File

@ -1630,16 +1630,14 @@ static void viafb_init_proc(struct viafb_shared *shared)
} }
static void viafb_remove_proc(struct viafb_shared *shared) static void viafb_remove_proc(struct viafb_shared *shared)
{ {
struct proc_dir_entry *viafb_entry = shared->proc_entry, struct proc_dir_entry *viafb_entry = shared->proc_entry;
*iga1_entry = shared->iga1_proc_entry,
*iga2_entry = shared->iga2_proc_entry;
if (!viafb_entry) if (!viafb_entry)
return; return;
remove_proc_entry("output_devices", iga2_entry); remove_proc_entry("output_devices", shared->iga2_proc_entry);
remove_proc_entry("iga2", viafb_entry); remove_proc_entry("iga2", viafb_entry);
remove_proc_entry("output_devices", iga1_entry); remove_proc_entry("output_devices", shared->iga1_proc_entry);
remove_proc_entry("iga1", viafb_entry); remove_proc_entry("iga1", viafb_entry);
remove_proc_entry("supported_output_devices", viafb_entry); remove_proc_entry("supported_output_devices", viafb_entry);