mwifiex: add custom IE framework

[deliverable/linux.git] / drivers / net / wireless / at76c50x-usb.c

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 39322d4121b79f17e90ecd39491b666c28c7217a..3036c0bab05668ddfd89d1b262df237adf4aa85b 100644 (file)
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -517,7 +517,7 @@ static char *hex2str(void *buf, size_t len)
                goto exit;
 
        while (len--) {
-               obuf = pack_hex_byte(obuf, *ibuf++);
+               obuf = hex_byte_pack(obuf, *ibuf++);
                *obuf++ = '-';
        }
        obuf--;
@@ -1122,12 +1122,12 @@ exit:
 static void at76_dump_mib_local(struct at76_priv *priv)
 {
        int ret;
-       struct mib_local *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
+       struct mib_local *m = kmalloc(sizeof(*m), GFP_KERNEL);
 
        if (!m)
                return;
 
-       ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));
+       ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(*m));
        if (ret < 0) {
                wiphy_err(priv->hw->wiphy,
                          "at76_get_mib (LOCAL) failed: %d\n", ret);
@@ -2512,10 +2512,8 @@ static void __exit at76_mod_exit(void)
 
        printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
        usb_deregister(&at76_driver);
-       for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
-               if (firmwares[i].fw)
-                       release_firmware(firmwares[i].fw);
-       }
+       for (i = 0; i < ARRAY_SIZE(firmwares); i++)
+               release_firmware(firmwares[i].fw);
        led_trigger_unregister_simple(ledtrig_tx);
 }