Re: [Bluez-users] Re: BT3C_CS broken in kernel 2.6.14? [Also with 2.6.15]

[Marcel Holtmann <marcel@holtmann.org>]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

Hi Antti,

> > > remember what the real problem or even the solution was when it came up
> > > on LKML. Try to do some research on LKML by yourself and also check the
> > > latest 2.6.14-git10 kernel.
> > 
> >   I tried now with 2.6.15 - Still not fixed. Can you point me to these LKML 
> > postings? I couldn't find then (tried searching with keywords bt3c, bluetooth 
> > and firmware - the latter two were too broad and the first did not give 
> > anything useful.)
> 
> it must have been something with the atmel_cs and request_firmware(),
> because the atmel_cs and bt3c_cs drivers had the same problem.

and maybe the attached patch helps. I haven't tested it, but it compiles
fine with my latest kernel.

Regards

Marcel


[-- Attachment #2: patch --]
[-- Type: text/x-patch, Size: 1192 bytes --]

diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index d2a0add..d6b021b 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -480,18 +480,6 @@ static int bt3c_hci_ioctl(struct hci_dev
 /* ======================== Card services HCI interaction ======================== */
 
 
-static struct device *bt3c_device(void)
-{
-	static struct device dev = {
-		.bus_id = "pcmcia",
-	};
-	kobject_set_name(&dev.kobj, "bt3c");
-	kobject_init(&dev.kobj);
-
-	return &dev;
-}
-
-
 static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count)
 {
 	char *ptr = (char *) firmware;
@@ -580,6 +568,7 @@ static int bt3c_open(bt3c_info_t *info)
 {
 	const struct firmware *firmware;
 	struct hci_dev *hdev;
+	client_handle_t handle;
 	int err;
 
 	spin_lock_init(&(info->lock));
@@ -611,8 +600,10 @@ static int bt3c_open(bt3c_info_t *info)
 
 	hdev->owner = THIS_MODULE;
 
+	handle = info->link.handle;
+
 	/* Load firmware */
-	err = request_firmware(&firmware, "BT3CPCC.bin", bt3c_device());
+	err = request_firmware(&firmware, "BT3CPCC.bin", &handle_to_dev(handle));
 	if (err < 0) {
 		BT_ERR("Firmware request failed");
 		goto error;