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

Merge tag 'staging-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging fixes from Greg KH:
 "Here are some small staging driver fixes and one driver removal for
  5.16-rc3.

  The fixes resolve a number of small issues found in 5.16-rc1, nothing
  huge at all. The driver removal was due to a platform being removed in
  5.16-rc1, but this driver was forgotten about. It wasn't being built
  anymore so it's safe to delete.

  All have been in linux-next for a while with no reported problems"

* tag 'staging-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect()
  staging: greybus: Add missing rwsem around snd_ctl_remove() calls
  staging: Remove Netlogic XLP network driver
  staging: r8188eu: fix a memory leak in rtw_wx_read32()
  staging: r8188eu: use GFP_ATOMIC under spinlock
  staging: r8188eu: Use kzalloc() with GFP_ATOMIC in atomic context
  staging/fbtft: Fix backlight
  staging: r8188eu: Fix breakage introduced when 5G code was removed
parents ba2cacc1 b535917c

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ source "drivers/staging/gdm724x/Kconfig" 


source "drivers/staging/fwserial/Kconfig"



source "drivers/staging/netlogic/Kconfig"



source "drivers/staging/gs_fpgaboot/Kconfig"



source "drivers/staging/unisys/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-$(CONFIG_RTL8723BS) += rtl8723bs/ 
obj-$(CONFIG_R8712U)		+= rtl8712/

obj-$(CONFIG_R8188EU)		+= r8188eu/

obj-$(CONFIG_RTS5208)		+= rts5208/

obj-$(CONFIG_NETLOGIC_XLR_NET)	+= netlogic/

obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/

obj-$(CONFIG_OCTEON_USB)	+= octeon-usb/

obj-$(CONFIG_VT6655)		+= vt6655/

drivers/staging/fbtft/fb_ssd1351.c

+0 −4
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ static struct fbtft_display display = { 
	},

};



#ifdef CONFIG_FB_BACKLIGHT

static int update_onboard_backlight(struct backlight_device *bd)

{

	struct fbtft_par *par = bl_get_data(bd);
@@ -231,9 +230,6 @@ static void register_onboard_backlight(struct fbtft_par *par) 
	if (!par->fbtftops.unregister_backlight)

		par->fbtftops.unregister_backlight = fbtft_unregister_backlight;

}

#else

static void register_onboard_backlight(struct fbtft_par *par) { };

#endif



FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1351", &display);

drivers/staging/fbtft/fbtft-core.c

+1 −8
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static int fbtft_request_gpios(struct fbtft_par *par) 
	return 0;

}



#ifdef CONFIG_FB_BACKLIGHT

static int fbtft_backlight_update_status(struct backlight_device *bd)

{

	struct fbtft_par *par = bl_get_data(bd);
@@ -161,6 +160,7 @@ void fbtft_unregister_backlight(struct fbtft_par *par) 
		par->info->bl_dev = NULL;

	}

}

EXPORT_SYMBOL(fbtft_unregister_backlight);



static const struct backlight_ops fbtft_bl_ops = {

	.get_brightness	= fbtft_backlight_get_brightness,
@@ -198,12 +198,7 @@ void fbtft_register_backlight(struct fbtft_par *par) 
	if (!par->fbtftops.unregister_backlight)

		par->fbtftops.unregister_backlight = fbtft_unregister_backlight;

}

#else

void fbtft_register_backlight(struct fbtft_par *par) { };

void fbtft_unregister_backlight(struct fbtft_par *par) { };

#endif

EXPORT_SYMBOL(fbtft_register_backlight);

EXPORT_SYMBOL(fbtft_unregister_backlight);



static void fbtft_set_addr_win(struct fbtft_par *par, int xs, int ys, int xe,

			       int ye)
@@ -853,13 +848,11 @@ int fbtft_register_framebuffer(struct fb_info *fb_info) 
		 fb_info->fix.smem_len >> 10, text1,

		 HZ / fb_info->fbdefio->delay, text2);



#ifdef CONFIG_FB_BACKLIGHT

	/* Turn on backlight if available */

	if (fb_info->bl_dev) {

		fb_info->bl_dev->props.power = FB_BLANK_UNBLANK;

		fb_info->bl_dev->ops->update_status(fb_info->bl_dev);

	}

#endif



	return 0;

drivers/staging/greybus/audio_helper.c

+6 −2
Original line number Diff line number Diff line
@@ -192,7 +192,11 @@ int gbaudio_remove_component_controls(struct snd_soc_component *component, 
				      unsigned int num_controls)

{

	struct snd_card *card = component->card->snd_card;

	int err;



	return gbaudio_remove_controls(card, component->dev, controls,

	down_write(&card->controls_rwsem);

	err = gbaudio_remove_controls(card, component->dev, controls,

				      num_controls, component->name_prefix);

	up_write(&card->controls_rwsem);

	return err;

}