diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/net/wireless/libertas/cmd.c | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/net/wireless/libertas/cmd.c')
| -rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 8542d85f36af..d45b07cf6a62 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
| @@ -604,9 +604,9 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel, | |||
| 604 | if (ret == 0) { | 604 | if (ret == 0) { |
| 605 | *curlevel = le16_to_cpu(cmd.curlevel); | 605 | *curlevel = le16_to_cpu(cmd.curlevel); |
| 606 | if (minlevel) | 606 | if (minlevel) |
| 607 | *minlevel = le16_to_cpu(cmd.minlevel); | 607 | *minlevel = cmd.minlevel; |
| 608 | if (maxlevel) | 608 | if (maxlevel) |
| 609 | *maxlevel = le16_to_cpu(cmd.maxlevel); | 609 | *maxlevel = cmd.maxlevel; |
| 610 | } | 610 | } |
| 611 | 611 | ||
| 612 | lbs_deb_leave(LBS_DEB_CMD); | 612 | lbs_deb_leave(LBS_DEB_CMD); |