diff options
Diffstat (limited to 'drivers/w1/masters/ds1wm.c')
-rw-r--r-- | drivers/w1/masters/ds1wm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c index 10211e493001..ea894bf18113 100644 --- a/drivers/w1/masters/ds1wm.c +++ b/drivers/w1/masters/ds1wm.c | |||
@@ -274,8 +274,8 @@ static u8 ds1wm_reset_bus(void *data) | |||
274 | return 0; | 274 | return 0; |
275 | } | 275 | } |
276 | 276 | ||
277 | static void ds1wm_search(void *data, u8 search_type, | 277 | static void ds1wm_search(void *data, struct w1_master *master_dev, |
278 | w1_slave_found_callback slave_found) | 278 | u8 search_type, w1_slave_found_callback slave_found) |
279 | { | 279 | { |
280 | struct ds1wm_data *ds1wm_data = data; | 280 | struct ds1wm_data *ds1wm_data = data; |
281 | int i; | 281 | int i; |
@@ -313,7 +313,7 @@ static void ds1wm_search(void *data, u8 search_type, | |||
313 | ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA); | 313 | ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA); |
314 | ds1wm_reset(ds1wm_data); | 314 | ds1wm_reset(ds1wm_data); |
315 | 315 | ||
316 | slave_found(ds1wm_data, rom_id); | 316 | slave_found(master_dev, rom_id); |
317 | } | 317 | } |
318 | 318 | ||
319 | /* --------------------------------------------------------------------- */ | 319 | /* --------------------------------------------------------------------- */ |