Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3

Authored by Pavel Machek
Committed by Jeff Garzik
1 parent feea1db26e
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] fix int vs. pm_message_t confusion in airo 

Fix int vs. pm_message_t confusion in airo. Should change no code.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/net/wireless/airo.c
Diff comments   View file @ 1cc68ae
... ... @@ -1209,7 +1209,7 @@
1209 1209 unsigned char __iomem *pciaux;
1210 1210 unsigned char *shared;
1211 1211 dma_addr_t shared_dma;
1212   - int power;
  1212 + pm_message_t power;
1213 1213 SsidRid *SSID;
1214 1214 APListRid *APList;
1215 1215 #define PCI_SHARED_LEN 2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE
1216 1216  
... ... @@ -5499,9 +5499,9 @@
5499 5499 cmd.cmd=HOSTSLEEP;
5500 5500 issuecommand(ai, &cmd, &rsp);
5501 5501  
5502   - pci_enable_wake(pdev, state, 1);
  5502 + pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
5503 5503 pci_save_state(pdev);
5504   - return pci_set_power_state(pdev, state);
  5504 + return pci_set_power_state(pdev, pci_choose_state(pdev, state));
5505 5505 }
5506 5506  
5507 5507 static int airo_pci_resume(struct pci_dev *pdev)
... ... @@ -5512,7 +5512,7 @@
5512 5512  
5513 5513 pci_set_power_state(pdev, 0);
5514 5514 pci_restore_state(pdev);
5515   - pci_enable_wake(pdev, ai->power, 0);
  5515 + pci_enable_wake(pdev, pci_choose_state(pdev, ai->power), 0);
5516 5516  
5517 5517 if (ai->power > 1) {
5518 5518 reset_card(dev, 0);
... ... @@ -5541,7 +5541,7 @@
5541 5541 }
5542 5542 writeConfigRid(ai, 0);
5543 5543 enable_MAC(ai, &rsp, 0);
5544   - ai->power = 0;
  5544 + ai->power = PMSG_ON;
5545 5545 netif_device_attach(dev);
5546 5546 netif_wake_queue(dev);
5547 5547 enable_interrupts(ai);