Skip to content

Commit 64612eb

Browse files
committed
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
2 parents 3b18ccb + 33c1452 commit 64612eb

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

drivers/w1/masters/w1-uart.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,11 @@ static int w1_uart_probe(struct serdev_device *serdev)
372372
init_completion(&w1dev->rx_byte_received);
373373
mutex_init(&w1dev->rx_mutex);
374374

375+
serdev_device_set_drvdata(serdev, w1dev);
376+
serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops);
375377
ret = w1_uart_serdev_open(w1dev);
376378
if (ret < 0)
377379
return ret;
378-
serdev_device_set_drvdata(serdev, w1dev);
379-
serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops);
380380

381381
return w1_add_master_device(&w1dev->bus);
382382
}

drivers/w1/slaves/w1_therm.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -444,18 +444,8 @@ static int w1_read(struct device *dev, enum hwmon_sensor_types type,
444444
}
445445
}
446446

447-
static const u32 w1_temp_config[] = {
448-
HWMON_T_INPUT,
449-
0
450-
};
451-
452-
static const struct hwmon_channel_info w1_temp = {
453-
.type = hwmon_temp,
454-
.config = w1_temp_config,
455-
};
456-
457447
static const struct hwmon_channel_info * const w1_info[] = {
458-
&w1_temp,
448+
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
459449
NULL
460450
};
461451

0 commit comments

Comments
 (0)