Re: after latest input updates, locomo keyboard kills boot

[Pavel Machek <pavel@suse.cz>]

Hi!

> > drivers/input/keyboard/locomokbd.c:
> >
> > struct locomokbd {
> >        unsigned char keycode[LOCOMOKBD_NUMKEYS];
> >        struct input_dev input;
> >        ~~~~~~~~~~~~~~~~~~~~~~~
> >
> > ...and I guess that's the problem. What needs to be done? Just replace
> > it with struct input_dev *?
> 
> Try the attached. BTW, shouldn't input->id.bus be BUS_HOST and not
> >BUS_XTKBD?

Yes, that helped, thanks a lot. Will you take care of merging, or
should I push it through akpm?
							Pavel

Fix compilation of locomokbd.

Signed-off-by: Pavel Machek <pavel@suse.cz>

---
commit ea66607091fbd8cfd2f0ab3a6218ec4d0ba399e4
tree 95f52c3742913a93cfdc6e15b43561cb1011ed2f
parent 5e047cfca8cb5833ac7c96d7c000270307316d1f
author <pavel@amd.(none)> Tue, 01 Nov 2005 20:03:07 +0100
committer <pavel@amd.(none)> Tue, 01 Nov 2005 20:03:07 +0100

 drivers/input/keyboard/locomokbd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -261,7 +261,7 @@ out:
 	release_mem_region((unsigned long) dev->mapbase, dev->length);
 	locomo_set_drvdata(dev, NULL);
 free:
-	input_free_device(input_dev)
+	input_free_device(input_dev);
 	kfree(locomokbd);
 
 	return ret;


Fix wrong bustype.

---
commit cb4e751101b0e359cec50565caba977c1e6d5709
tree b6779a09e5685efd00e72e5161f08bd6bc5b494a
parent ea66607091fbd8cfd2f0ab3a6218ec4d0ba399e4
author <pavel@amd.(none)> Tue, 01 Nov 2005 20:05:23 +0100
committer <pavel@amd.(none)> Tue, 01 Nov 2005 20:05:23 +0100

 drivers/input/keyboard/locomokbd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -230,7 +230,7 @@ static int locomokbd_probe(struct locomo
 
 	input_dev->name = "LoCoMo keyboard";
 	input_dev->phys = locomokbd->phys;
-	input_dev->id.bustype = BUS_XTKBD;
+	input_dev->id.bustype = BUS_HOST;
 	input_dev->id.vendor = 0x0001;
 	input_dev->id.product = 0x0001;
 	input_dev->id.version = 0x0100;


-- 
Thanks, Sharp!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/