/[linux-patches]/genpatches-2.6/trunk/2.6.14/2900_bt3c-cs-crash.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/2900_bt3c-cs-crash.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 8 months ago) by johnm
File MIME type: text/x-diff
File size: 1192 byte(s)
2.6.14-11, rebase against local tree
1 diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
2 index d2a0add..d6b021b 100644
3 --- a/drivers/bluetooth/bt3c_cs.c
4 +++ b/drivers/bluetooth/bt3c_cs.c
5 @@ -480,18 +480,6 @@ static int bt3c_hci_ioctl(struct hci_dev
6 /* ======================== Card services HCI interaction ======================== */
7
8
9 -static struct device *bt3c_device(void)
10 -{
11 - static struct device dev = {
12 - .bus_id = "pcmcia",
13 - };
14 - kobject_set_name(&dev.kobj, "bt3c");
15 - kobject_init(&dev.kobj);
16 -
17 - return &dev;
18 -}
19 -
20 -
21 static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count)
22 {
23 char *ptr = (char *) firmware;
24 @@ -580,6 +568,7 @@ static int bt3c_open(bt3c_info_t *info)
25 {
26 const struct firmware *firmware;
27 struct hci_dev *hdev;
28 + client_handle_t handle;
29 int err;
30
31 spin_lock_init(&(info->lock));
32 @@ -611,8 +600,10 @@ static int bt3c_open(bt3c_info_t *info)
33
34 hdev->owner = THIS_MODULE;
35
36 + handle = info->link.handle;
37 +
38 /* Load firmware */
39 - err = request_firmware(&firmware, "BT3CPCC.bin", bt3c_device());
40 + err = request_firmware(&firmware, "BT3CPCC.bin", &handle_to_dev(handle));
41 if (err < 0) {
42 BT_ERR("Firmware request failed");
43 goto error;

  ViewVC Help
Powered by ViewVC 1.1.20