diff options
Diffstat (limited to 'meta/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch')
-rw-r--r-- | meta/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch b/meta/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch new file mode 100644 index 0000000000..d2e8a5bc4c --- /dev/null +++ b/meta/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | diff -up orinoco-0.15rc2/orinoco_pci.c orinoco-0.15rc2-new/orinoco_pci.c | ||
2 | --- orinoco-0.15rc2/orinoco_pci.c 2004-07-28 08:06:45.000000000 +0200 | ||
3 | +++ orinoco-0.15rc2-new/orinoco_pci.c 2005-06-19 17:13:07.000000000 +0200 | ||
4 | @@ -327,7 +327,7 @@ static int orinoco_pci_suspend(struct pc | ||
5 | |||
6 | orinoco_unlock(priv, &flags); | ||
7 | |||
8 | - pci_save_state(pdev, card->pci_state); | ||
9 | + pci_save_state(pdev); | ||
10 | pci_set_power_state(pdev, 3); | ||
11 | |||
12 | return 0; | ||
13 | @@ -344,7 +344,7 @@ static int orinoco_pci_resume(struct pci | ||
14 | printk(KERN_DEBUG "%s: Orinoco-PCI waking up\n", dev->name); | ||
15 | |||
16 | pci_set_power_state(pdev, 0); | ||
17 | - pci_restore_state(pdev, card->pci_state); | ||
18 | + pci_restore_state(pdev); | ||
19 | |||
20 | err = orinoco_reinit_firmware(dev); | ||
21 | if (err) { | ||
22 | diff -up orinoco-0.15rc2/spectrum_cs.c orinoco-0.15rc2-new/spectrum_cs.c | ||
23 | --- orinoco-0.15rc2/spectrum_cs.c 2004-07-28 08:06:45.000000000 +0200 | ||
24 | +++ orinoco-0.15rc2-new/spectrum_cs.c 2005-06-19 18:06:39.000000000 +0200 | ||
25 | @@ -579,12 +579,13 @@ static int | ||
26 | spectrum_dl_firmware(hermes_t *hw, dev_link_t *link) | ||
27 | { | ||
28 | int ret; | ||
29 | + client_handle_t handle = link->handle; | ||
30 | |||
31 | #ifndef SPECTRUM_FW_INCLUDED | ||
32 | const struct firmware *fw_entry; | ||
33 | |||
34 | if (request_firmware(&fw_entry, primary_fw_name, | ||
35 | - spectrum_cs_device) == 0) { | ||
36 | + &handle_to_dev(handle)) == 0) { | ||
37 | primsym = fw_entry->data; | ||
38 | } else { | ||
39 | printk(KERN_ERR PFX "Cannot find firmware: %s\n", | ||
40 | @@ -593,7 +594,7 @@ spectrum_dl_firmware(hermes_t *hw, dev_l | ||
41 | } | ||
42 | |||
43 | if (request_firmware(&fw_entry, secondary_fw_name, | ||
44 | - spectrum_cs_device) == 0) { | ||
45 | + &handle_to_dev(handle)) == 0) { | ||
46 | secsym = fw_entry->data; | ||
47 | } else { | ||
48 | printk(KERN_ERR PFX "Cannot find firmware: %s\n", | ||