Commit 775a15ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.13-6' of... 

Merge tag 'platform-drivers-x86-v6.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:

 - dell-uart-backlight: Fix serdev race

 - lenovo-yoga-tab2-pro-1380-fastcharger: Fix serdev race

* tag 'platform-drivers-x86-v6.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: lenovo-yoga-tab2-pro-1380-fastcharger: fix serdev race
  platform/x86: dell-uart-backlight: fix serdev race
parents 42f38ccb 59616a91

drivers/platform/x86/dell/dell-uart-backlight.c

+3 −2
Original line number Diff line number Diff line
@@ -283,6 +283,9 @@ static int dell_uart_bl_serdev_probe(struct serdev_device *serdev) 
	init_waitqueue_head(&dell_bl->wait_queue);

	dell_bl->dev = dev;



	serdev_device_set_drvdata(serdev, dell_bl);

	serdev_device_set_client_ops(serdev, &dell_uart_bl_serdev_ops);



	ret = devm_serdev_device_open(dev, serdev);

	if (ret)

		return dev_err_probe(dev, ret, "opening UART device\n");
@@ -290,8 +293,6 @@ static int dell_uart_bl_serdev_probe(struct serdev_device *serdev) 
	/* 9600 bps, no flow control, these are the default but set them to be sure */

	serdev_device_set_baudrate(serdev, 9600);

	serdev_device_set_flow_control(serdev, false);

	serdev_device_set_drvdata(serdev, dell_bl);

	serdev_device_set_client_ops(serdev, &dell_uart_bl_serdev_ops);



	get_version[0] = DELL_SOF(GET_CMD_LEN);

	get_version[1] = CMD_GET_VERSION;

drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c

+3 −2
Original line number Diff line number Diff line
@@ -199,14 +199,15 @@ static int yt2_1380_fc_serdev_probe(struct serdev_device *serdev) 
	if (ret)

		return ret;



	serdev_device_set_drvdata(serdev, fc);

	serdev_device_set_client_ops(serdev, &yt2_1380_fc_serdev_ops);



	ret = devm_serdev_device_open(dev, serdev);

	if (ret)

		return dev_err_probe(dev, ret, "opening UART device\n");



	serdev_device_set_baudrate(serdev, 600);

	serdev_device_set_flow_control(serdev, false);

	serdev_device_set_drvdata(serdev, fc);

	serdev_device_set_client_ops(serdev, &yt2_1380_fc_serdev_ops);



	ret = devm_extcon_register_notifier_all(dev, fc->extcon, &fc->nb);

	if (ret)