Commit 64612eb9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'w1-drv-6.15' of... 

Merge tag 'w1-drv-6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 into char-misc-next

Krzysztof writes:

1-Wire bus drivers for v6.14

1. W1 UART: Fix theoretical NULL pointer dereference in probe due to
   serdev ops being set too late.  That's said such scenario is unlikely
   to happen as serdev read would need to happen before writing
   anything.

2. W1 therm: Simplify with HWMON_CHANNEL_INFO.

* tag 'w1-drv-6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1:
  w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code
  w1: fix NULL pointer dereference in probe
parents 3b18ccb5 33c14529

drivers/w1/masters/w1-uart.c

+2 −2
Original line number Diff line number Diff line
@@ -372,11 +372,11 @@ static int w1_uart_probe(struct serdev_device *serdev) 
	init_completion(&w1dev->rx_byte_received);

	mutex_init(&w1dev->rx_mutex);



	serdev_device_set_drvdata(serdev, w1dev);

	serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops);

	ret = w1_uart_serdev_open(w1dev);

	if (ret < 0)

		return ret;

	serdev_device_set_drvdata(serdev, w1dev);

	serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops);



	return w1_add_master_device(&w1dev->bus);

}

drivers/w1/slaves/w1_therm.c

+1 −11
Original line number Diff line number Diff line
@@ -444,18 +444,8 @@ static int w1_read(struct device *dev, enum hwmon_sensor_types type, 
	}

}



static const u32 w1_temp_config[] = {

	HWMON_T_INPUT,

	0

};



static const struct hwmon_channel_info w1_temp = {

	.type = hwmon_temp,

	.config = w1_temp_config,

};



static const struct hwmon_channel_info * const w1_info[] = {

	&w1_temp,

	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),

	NULL

};