On 256, 09 13, 2009 at 10:17:58 -0400, Mike Frysinger wrote: > From: Javier Herrero <jherrero@xxxxxxxxxxxxx> > > Driver for the keyboard hardware documented here: > http://www.opencores.org/project,keyboardcontroller > > Signed-off-by: Javier Herrero <jherrero@xxxxxxxxxxxxx> > Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> > Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx> > --- > +static int __devinit opencores_kbd_probe(struct platform_device *pdev) > +{ > + struct input_dev *input; > + struct opencores_kbd *opencores_kbd; > + int i, error; > + > + opencores_kbd = kzalloc(sizeof(*opencores_kbd), GFP_KERNEL); > + if (!opencores_kbd) > + return -ENOMEM; > + > + opencores_kbd->keycode = kmalloc(NUM_KEYS * sizeof(unsigned short), GFP_KERNEL); > + if (!opencores_kbd->keycode) { > + error = -ENOMEM; > + goto out; > + } > + > + platform_set_drvdata(pdev, opencores_kbd); > + > + opencores_kbd->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + opencores_kbd->irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > + > + if (opencores_kbd->addr_res == NULL || opencores_kbd->irq_res == NULL) { > + printk(KERN_ERR "insufficient resources\n"); > + error = -ENOENT; > + goto out1; > + } > + > + error = request_irq(opencores_kbd->irq_res->start, &opencores_kbd_isr, IRQF_TRIGGER_RISING, pdev->name, pdev); What if interrupt will trigger right here ? It's common pattern for input drivers to request irq after input_allocate_device(). > + if (error) { > + printk(KERN_ERR DRV_NAME ": Unable to claim irq %d; error %d\n", opencores_kbd->irq_res->start, error); > + goto out2; Looks like out1 should be used here, otherwise you will try to free irq which was not registered yet. > + } > + > + input = input_allocate_device(); > + if (!input) { > + error = -ENOMEM; > + goto out3; out2 ? > + } > + > + opencores_kbd->input = input; > + > + input->name = pdev->name; > + input->phys = "opencores-kbd/input0"; > + input->dev.parent = &pdev->dev; > + > + input_set_drvdata(input, opencores_kbd); > + > + input->id.bustype = BUS_HOST; > + input->id.vendor = 0x0001; > + input->id.product = 0x0001; > + input->id.version = 0x0100; > + > + input->keycodesize = sizeof(*opencores_kbd->keycode); > + input->keycodemax = NUM_KEYS; > + input->keycode = opencores_kbd->keycode; > + > + __set_bit(EV_KEY, input->evbit); > + > + for (i = 0; i < input->keycodemax; i++) { > + opencores_kbd->keycode[i] = i; > + __set_bit(opencores_kbd->keycode[i] & KEY_MAX, input->keybit); > + } > + __clear_bit(KEY_RESERVED, input->keybit); > + > + error = input_register_device(opencores_kbd->input); > + if (error) { > + printk(KERN_ERR DRV_NAME ": Unable to register input device (%d)\n", error); > + goto out2; out3 ? > + } > + > + return 0; > + > +out3: > + input_free_device(input); > +out2: > + free_irq(opencores_kbd->irq_res->start, pdev); > +out1: > + kfree(opencores_kbd->keycode); > +out: > + kfree(opencores_kbd); > + platform_set_drvdata(pdev, NULL); > + > + return error; > +} -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
