Skip to content

Commit

Permalink
libertas: Use lbs_cmd() for setting Boot2 version
Browse files Browse the repository at this point in the history
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Woodhouse authored and David S. Miller committed Jan 28, 2008
1 parent 09d4fad commit 04c80f1
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions drivers/net/wireless/libertas/if_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,21 @@ static void if_usb_free(struct usb_card_rec *cardp)
lbs_deb_leave(LBS_DEB_USB);
}

static void if_usb_set_boot2_ver(struct lbs_private *priv)
{
struct cmd_ds_set_boot2_ver b2_cmd;
int rsp_len = sizeof(b2_cmd);

b2_cmd.action = 0;
b2_cmd.version = cpu_to_le16(priv->boot2_version);

if (lbs_cmd(priv, CMD_SET_BOOT2_VER, &b2_cmd, sizeof(b2_cmd),
&b2_cmd, &rsp_len)) {
lbs_deb_usb("Setting boot2 version failed\n");
}
}


/**
* @brief sets the configuration values
* @param ifnum interface number
Expand Down Expand Up @@ -222,10 +237,7 @@ static int if_usb_probe(struct usb_interface *intf,
if (lbs_start_card(priv))
goto err_start_card;

/* Set the boot2 version in firmware, ignoring errors. */
(void)lbs_prepare_and_send_command(priv, CMD_SET_BOOT2_VER,
0, CMD_OPTION_WAITFORRSP, 0, NULL);

if_usb_set_boot2_ver(priv);

usb_get_dev(udev);
usb_set_intfdata(intf, cardp);
Expand Down

0 comments on commit 04c80f1

Please sign in to comment.