Merge pull request #2 from kuba-moo/fixes

more fixes
This commit is contained in:
nbd168
2015-02-27 09:21:16 +13:00
5 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -78,7 +78,7 @@ irqreturn_t mt76_irq_handler(int irq, void *dev_instance)
intr = mt76_rr(dev, MT_INT_SOURCE_CSR);
mt76_wr(dev, MT_INT_SOURCE_CSR, intr);
if (!test_bit(MT76_STATE_INITAILIZED, &dev->state))
if (!test_bit(MT76_STATE_INITIALIZED, &dev->state))
return IRQ_NONE;
trace_dev_irq(dev, intr, dev->irqmask);
+1 -1
View File
@@ -507,7 +507,7 @@ int mt76_init_hardware(struct mt76_dev *dev)
if (ret)
return ret;
set_bit(MT76_STATE_INITAILIZED, &dev->state);
set_bit(MT76_STATE_INITIALIZED, &dev->state);
ret = mt76_mac_start(dev);
if (ret)
return ret;
+2 -2
View File
@@ -161,7 +161,7 @@ mt76pci_load_rom_patch(struct mt76_dev *dev)
}
hdr = (struct mt76_patch_header *) fw->data;
printk("ROM patch build: %15s\n", hdr->build_time);
printk("ROM patch build: %.15s\n", hdr->build_time);
mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, MT_MCU_ROM_PATCH_OFFSET);
@@ -217,7 +217,7 @@ mt76pci_load_firmware(struct mt76_dev *dev)
val = le16_to_cpu(hdr->build_ver);
printk("Build: %x\n", val);
printk("Build Time: %16s\n", hdr->build_time);
printk("Build Time: %.16s\n", hdr->build_time);
cur = (__le32 *) (fw->data + sizeof(*hdr));
len = le32_to_cpu(hdr->ilm_len);
+1 -1
View File
@@ -58,7 +58,7 @@ struct mt76_queue_entry {
};
enum {
MT76_STATE_INITAILIZED,
MT76_STATE_INITIALIZED,
MT76_STATE_RUNNING,
MT76_SCANNING,
};
+3 -2
View File
@@ -425,8 +425,9 @@
#define MT_TX_AGG_CNT_BASE0 0x1720
#define MT_TX_AGG_CNT_BASE1 0x174c
#define MT_TX_AGG_CNT(_id) (((_id) > 7 ? MT_TX_AGG_CNT_BASE1 : \
MT_TX_AGG_CNT_BASE0) + ((_id) << 2))
#define MT_TX_AGG_CNT(_id) ((_id) < 8 ? \
MT_TX_AGG_CNT_BASE0 + ((_id) << 2) : \
MT_TX_AGG_CNT_BASE1 + ((_id - 8) << 2))
#define MT_TX_STAT_FIFO_EXT 0x1798
#define MT_TX_STAT_FIFO_EXT_RETRY GENMASK(7, 0)