[ARM] S3C maintainer updates merge branch maintainers-updates into s3c-fixes

[pandora-kernel.git] / drivers / net / wireless / zd1211rw / zd_rf_uw2453.c

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
index 414e40d..439799b 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
@@ -1,4 +1,7 @@
-/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
+/* ZD1211 USB-WLAN driver for Linux
+ *
+ * Copyright (C) 2005-2007 Ulrich Kunitz <kune@deine-taler.de>
+ * Copyright (C) 2006-2007 Daniel Drake <dsd@gentoo.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -403,7 +406,7 @@ static int uw2453_init_hw(struct zd_rf *rf)
                if (r)
                        return r;
 
-               if (!intr_status & 0xf) {
+               if (!(intr_status & 0xf)) {
                        dev_dbg_f(zd_chip_dev(chip),
                                "PLL locked on configuration %d\n", i);
                        found_config = i;
@@ -486,7 +489,7 @@ static int uw2453_switch_radio_on(struct zd_rf *rf)
        if (r)
                return r;
 
-       if (chip->is_zd1211b)
+       if (zd_chip_is_zd1211b(chip))
                ioreqs[1].value = 0x7f;
 
        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));