From 892c4b2b4283d27db4aac438db23433acf8f9396 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 11 Aug 2012 13:09:20 +0200 Subject: [PATCH] --- yaml --- r: 327537 b: refs/heads/master c: 22c5649eef0fc37532e20c14d2656b28ca708a69 h: refs/heads/master i: 327535: ac3b273460ae3da905dca30bd7738be731884ec1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/eeprom.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c4a928a4ffc0..9cbd976a39e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df32381896f5f0c78a371df2e49ab7c776b1a5ba +refs/heads/master: 22c5649eef0fc37532e20c14d2656b28ca708a69 diff --git a/trunk/drivers/net/wireless/p54/eeprom.c b/trunk/drivers/net/wireless/p54/eeprom.c index d4d86107e05a..1ef1bfe6a9d7 100644 --- a/trunk/drivers/net/wireless/p54/eeprom.c +++ b/trunk/drivers/net/wireless/p54/eeprom.c @@ -288,10 +288,14 @@ static int p54_get_maxpower(struct p54_common *priv, void *data) for (j = 0; j < ARRAY_SIZE(pda->point); j++) { struct pda_channel_output_limit_point_longbow *point = &pda->point[j]; - rawpower = max(rawpower, le16_to_cpu(point->val_qpsk)); - rawpower = max(rawpower, le16_to_cpu(point->val_bpsk)); - rawpower = max(rawpower, le16_to_cpu(point->val_16qam)); - rawpower = max(rawpower, le16_to_cpu(point->val_64qam)); + rawpower = max_t(u16, + rawpower, le16_to_cpu(point->val_qpsk)); + rawpower = max_t(u16, + rawpower, le16_to_cpu(point->val_bpsk)); + rawpower = max_t(u16, + rawpower, le16_to_cpu(point->val_16qam)); + rawpower = max_t(u16, + rawpower, le16_to_cpu(point->val_64qam)); } /* longbow seems to use 1/16 dBm units */ return rawpower / 16;