Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a448294 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 162f73f4 b429f96a

drivers/video/fbdev/core/fbmon.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	     i++, block += DETAILED_TIMING_DESCRIPTION_SIZE)

		if (PIXEL_CLOCK)

		if (PIXEL_CLOCK != 0)

			edt[num++] = block - edid;



	/* Yikes, EDID data is totally useless */

drivers/video/fbdev/smscufx.c

+3 −2
Original line number Diff line number Diff line
@@ -1646,8 +1646,9 @@ static int ufx_usb_probe(struct usb_interface *interface, 
	dev_dbg(dev->gdev, "%s %s - serial #%s\n",

		usbdev->manufacturer, usbdev->product, usbdev->serial);

	dev_dbg(dev->gdev, "vid_%04x&pid_%04x&rev_%04x driver's ufx_data struct at %p\n",

		usbdev->descriptor.idVendor, usbdev->descriptor.idProduct,

		usbdev->descriptor.bcdDevice, dev);

		le16_to_cpu(usbdev->descriptor.idVendor),

		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, "fb_defio enable=%d\n", fb_defio);

drivers/video/fbdev/udlfb.c

+5 −4
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static int dlfb_ops_blank(int blank_mode, struct fb_info *info) 
	char *bufptr;

	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);



	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",

		usbdev->manufacturer, usbdev->product, usbdev->serial);

	pr_info("vid_%04x&pid_%04x&rev_%04x driver's dlfb_data struct at %p\n",

		usbdev->descriptor.idVendor, usbdev->descriptor.idProduct,

		usbdev->descriptor.bcdDevice, dev);

		le16_to_cpu(usbdev->descriptor.idVendor),

		le16_to_cpu(usbdev->descriptor.idProduct),

		le16_to_cpu(usbdev->descriptor.bcdDevice), dev);

	pr_info("console enable=%d\n", console);

	pr_info("fb_defio enable=%d\n", fb_defio);

	pr_info("shadow enable=%d\n", shadow);

drivers/video/fbdev/via/viafbdev.c

+3 −5
Original line number Diff line number Diff line
@@ -1630,16 +1630,14 @@ static void viafb_init_proc(struct viafb_shared *shared) 
}

static void viafb_remove_proc(struct viafb_shared *shared)

{

	struct proc_dir_entry *viafb_entry = shared->proc_entry,

		*iga1_entry = shared->iga1_proc_entry,

		*iga2_entry = shared->iga2_proc_entry;

	struct proc_dir_entry *viafb_entry = shared->proc_entry;



	if (!viafb_entry)

		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("output_devices", iga1_entry);

	remove_proc_entry("output_devices", shared->iga1_proc_entry);

	remove_proc_entry("iga1", viafb_entry);

	remove_proc_entry("supported_output_devices", viafb_entry);