Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256093
b: refs/heads/master
c: 6691678
h: refs/heads/master
i:
  256091: 1f22482
v: v3
  • Loading branch information
Sergei Shtylyov authored and John W. Linville committed Jun 27, 2011
1 parent 05664ef commit 135e55c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5e5aa6cee4cdb967a1f1c33a31165062783ccea
refs/heads/master: 6691678dca1057840d8f25ee038541d4e4100b17
4 changes: 1 addition & 3 deletions trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
struct iwl_pci_bus *bus;
u8 rev_id;
u16 pci_cmd;
int err;

Expand Down Expand Up @@ -440,8 +439,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
(unsigned long long) pci_resource_len(pdev, 0));
pr_info("pci_resource_base = %p\n", bus->hw_base);

pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
pr_info("HW Revision ID = 0x%X\n", rev_id);
pr_info("HW Revision ID = 0x%X\n", pdev->revision);

/* We disable the RETRY_TIMEOUT register (0x41) to keep
* PCI Tx retries from interfering with C3 CPU state */
Expand Down

0 comments on commit 135e55c

Please sign in to comment.