Skip to content

Commit

Permalink
W1 OMAP: Fix OMAP LDP boot crash
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stanley.Miao authored and Linus Torvalds committed Nov 20, 2008
1 parent f55491a commit 06b0d4d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/w1/masters/omap_hdq.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ static struct platform_driver omap_hdq_driver = {
static u8 omap_w1_read_byte(void *_hdq);
static void omap_w1_write_byte(void *_hdq, u8 byte);
static u8 omap_w1_reset_bus(void *_hdq);
static void omap_w1_search_bus(void *_hdq, u8 search_type,
w1_slave_found_callback slave_found);
static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
u8 search_type, w1_slave_found_callback slave_found);


static struct w1_bus_master omap_w1_master = {
Expand Down Expand Up @@ -231,8 +231,8 @@ static u8 omap_w1_reset_bus(void *_hdq)
}

/* W1 search callback function */
static void omap_w1_search_bus(void *_hdq, u8 search_type,
w1_slave_found_callback slave_found)
static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
u8 search_type, w1_slave_found_callback slave_found)
{
u64 module_id, rn_le, cs, id;

Expand All @@ -249,7 +249,7 @@ static void omap_w1_search_bus(void *_hdq, u8 search_type,
cs = w1_calc_crc8((u8 *)&rn_le, 7);
id = (cs << 56) | module_id;

slave_found(_hdq, id);
slave_found(master_dev, id);
}

static int _omap_hdq_reset(struct hdq_data *hdq_data)
Expand Down

0 comments on commit 06b0d4d

Please sign in to comment.