diff options
| author | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-02-23 15:19:57 -0800 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-02-23 15:19:57 -0800 |
| commit | 1eda138f0bd5655ea8c819d027d3e37e907daa86 (patch) | |
| tree | a6c35a9cd98d1a95d53296b442f8feea62cb3386 /patches | |
| parent | c9936afc2a4682105ddf04edacf4616d01eec22e (diff) | |
compat-wireless: fix patches/24-pcmcia.patch
Some hunk offsets were off.
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/24-pcmcia.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch index 35ed8134..353a267b 100644 --- a/patches/24-pcmcia.patch +++ b/patches/24-pcmcia.patch @@ -64,7 +64,7 @@ @@ -621,7 +642,11 @@ static int bluecard_hci_flush(struct hci static int bluecard_hci_open(struct hci_dev *hdev) { - bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data); + bluecard_info_t *info = hci_get_drvdata(hdev); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) unsigned int iobase = info->p_dev->resource[0]->start; +#else @@ -76,7 +76,7 @@ @@ -641,7 +666,11 @@ static int bluecard_hci_open(struct hci_ static int bluecard_hci_close(struct hci_dev *hdev) { - bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data); + bluecard_info_t *info = hci_get_drvdata(hdev); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) unsigned int iobase = info->p_dev->resource[0]->start; +#else @@ -85,7 +85,7 @@ if (!test_and_clear_bit(HCI_RUNNING, &(hdev->flags))) return 0; -@@ -708,7 +737,11 @@ static int bluecard_hci_ioctl(struct hci +@@ -703,7 +732,11 @@ static int bluecard_hci_ioctl(struct hci static int bluecard_open(bluecard_info_t *info) { @@ -97,7 +97,7 @@ struct hci_dev *hdev; unsigned char id; -@@ -827,7 +860,11 @@ static int bluecard_open(bluecard_info_t +@@ -819,7 +852,11 @@ static int bluecard_open(bluecard_info_t static int bluecard_close(bluecard_info_t *info) { @@ -109,7 +109,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -862,7 +899,18 @@ static int bluecard_probe(struct pcmcia_ +@@ -854,7 +891,18 @@ static int bluecard_probe(struct pcmcia_ info->p_dev = link; link->priv = info; @@ -128,7 +128,7 @@ return bluecard_config(link); } -@@ -882,15 +930,30 @@ static int bluecard_config(struct pcmcia +@@ -874,15 +922,30 @@ static int bluecard_config(struct pcmcia bluecard_info_t *info = link->priv; int i, n; @@ -159,7 +159,7 @@ if (i == 0) break; } -@@ -898,9 +961,15 @@ static int bluecard_config(struct pcmcia +@@ -890,9 +953,15 @@ static int bluecard_config(struct pcmcia if (i != 0) goto failed; @@ -175,7 +175,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -938,7 +1007,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids +@@ -930,7 +999,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids static struct pcmcia_driver bluecard_driver = { .owner = THIS_MODULE, |