Commit b72018ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev fixes from Helge Deller:
 "A use-after-free bugfix in the smscufx driver and various minor error
  path fixes, smaller build fixes, sysfs fixes and typos in comments in
  the stifb, sisfb, da8xxfb, xilinxfb, sm501fb, gbefb and cyber2000fb
  drivers"

* tag 'fbdev-for-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: cyber2000fb: fix missing pci_disable_device()
  fbdev: sisfb: use explicitly signed char
  fbdev: smscufx: Fix several use-after-free bugs
  fbdev: xilinxfb: Make xilinxfb_release() return void
  fbdev: sisfb: fix repeated word in comment
  fbdev: gbefb: Convert sysfs snprintf to sysfs_emit
  fbdev: sm501fb: Convert sysfs snprintf to sysfs_emit
  fbdev: stifb: Fall back to cfb_fillrect() on 32-bit HCRX cards
  fbdev: da8xx-fb: Fix error handling in .remove()
  fbdev: MIPS supports iomem addresses
parents 9f127546 3c6bf6bd

drivers/usb/misc/sisusbvga/sisusb_struct.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct SiS_Ext { 
	unsigned char VB_ExtTVYFilterIndex;

	unsigned char VB_ExtTVYFilterIndexROM661;

	unsigned char REFindex;

	char ROMMODEIDX661;

	signed char ROMMODEIDX661;

};



struct SiS_Ext2 {

drivers/video/fbdev/cyber2000fb.c

+2 −0
Original line number Diff line number Diff line
@@ -1796,6 +1796,7 @@ static int cyberpro_pci_probe(struct pci_dev *dev, 
failed_regions:

	cyberpro_free_fb_info(cfb);

failed_release:

	pci_disable_device(dev);

	return err;

}
@@ -1812,6 +1813,7 @@ static void cyberpro_pci_remove(struct pci_dev *dev) 
			int_cfb_info = NULL;



		pci_release_regions(dev);

		pci_disable_device(dev);

	}

}

drivers/video/fbdev/da8xx-fb.c

+2 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,8 @@ static int fb_remove(struct platform_device *dev) 
	if (par->lcd_supply) {

		ret = regulator_disable(par->lcd_supply);

		if (ret)

			return ret;

			dev_warn(&dev->dev, "Failed to disable regulator (%pe)\n",

				 ERR_PTR(ret));

	}



	lcd_disable_raster(DA8XX_FRAME_WAIT);

drivers/video/fbdev/gbefb.c

+2 −2
Original line number Diff line number Diff line
@@ -1060,14 +1060,14 @@ static const struct fb_ops gbefb_ops = { 


static ssize_t gbefb_show_memsize(struct device *dev, struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%u\n", gbe_mem_size);

	return sysfs_emit(buf, "%u\n", gbe_mem_size);

}



static DEVICE_ATTR(size, S_IRUGO, gbefb_show_memsize, NULL);



static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", gbe_revision);

	return sysfs_emit(buf, "%d\n", gbe_revision);

}



static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL);

drivers/video/fbdev/sis/sis_accel.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ SiS310SubsequentScreenToScreenCopy(struct sis_video_info *ivideo, int src_x, int 
	 * and destination blitting areas overlap and

	 * adapt the bitmap addresses synchronously

	 * if the coordinates exceed the valid range.

	 * The the areas do not overlap, we do our

	 * The areas do not overlap, we do our

	 * normal check.

	 */

	if((mymax - mymin) < height) {