Skip to content

Commit

Permalink
libertas: Move SET_BOOT2_VER command to if_usb where it belongs
Browse files Browse the repository at this point in the history
This is meaningless for non-USB devices and unimplemented in their
firmware. It's somewhat dubious for USB devices too, but that's a
different story.

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 9088566 commit 2c94404
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 5 additions & 0 deletions drivers/net/wireless/libertas/if_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,11 @@ 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);


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

Expand Down
4 changes: 0 additions & 4 deletions drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -999,10 +999,6 @@ static int lbs_setup_firmware(struct lbs_private *priv)
priv->mesh_autostart_enabled = 0;
}

/* Set the boot2 version in firmware */
ret = lbs_prepare_and_send_command(priv, CMD_SET_BOOT2_VER,
0, CMD_OPTION_WAITFORRSP, 0, NULL);

ret = 0;
done:
lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);
Expand Down

0 comments on commit 2c94404

Please sign in to comment.