Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
W1 OMAP: Fix OMAP LDP boot crash
OMAP LDP boot crash. This is because w1 subsystem changed the search
interface, so update omap_hdq's search interface to follow the change.
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Stanley.Miao
and committed by
Linus Torvalds
06b0d4dc
f55491a4
+5
-5
+5
-5
drivers/w1/masters/omap_hdq.c
+5
-5
drivers/w1/masters/omap_hdq.c
···
86
86
static u8 omap_w1_read_byte(void *_hdq);
87
87
static void omap_w1_write_byte(void *_hdq, u8 byte);
88
88
static u8 omap_w1_reset_bus(void *_hdq);
89
-
static void omap_w1_search_bus(void *_hdq, u8 search_type,
90
-
w1_slave_found_callback slave_found);
89
+
static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
90
+
u8 search_type, w1_slave_found_callback slave_found);
91
91
92
92
93
93
static struct w1_bus_master omap_w1_master = {
···
231
231
}
232
232
233
233
/* W1 search callback function */
234
-
static void omap_w1_search_bus(void *_hdq, u8 search_type,
235
-
w1_slave_found_callback slave_found)
234
+
static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
235
+
u8 search_type, w1_slave_found_callback slave_found)
236
236
{
237
237
u64 module_id, rn_le, cs, id;
238
238
···
249
249
cs = w1_calc_crc8((u8 *)&rn_le, 7);
250
250
id = (cs << 56) | module_id;
251
251
252
-
slave_found(_hdq, id);
252
+
slave_found(master_dev, id);
253
253
}
254
254
255
255
static int _omap_hdq_reset(struct hdq_data *hdq_data)