lkml.org 
[lkml]   [2005]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH] Convert dmasound_awacs to dynamic input_dev allocation
    Hi,

    This patch converts sound/oss/dmasound/dmasound_awacs.c to use dynamic
    input_dev allocation, stopping an oops on boot with the latest
    kernels.

    Thanks,

    -i

    Signed-off-by: Ian Wienand <ianw@gelato.unsw.edu.au>

    ---
    diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
    --- a/sound/oss/dmasound/dmasound_awacs.c
    +++ b/sound/oss/dmasound/dmasound_awacs.c
    @@ -2805,16 +2805,7 @@ __init setup_beep(void)
    return 0 ;
    }

    -static struct input_dev awacs_beep_dev = {
    - .evbit = { BIT(EV_SND) },
    - .sndbit = { BIT(SND_BELL) | BIT(SND_TONE) },
    - .event = awacs_beep_event,
    - .name = "dmasound beeper",
    - .phys = "macio/input0", /* what the heck is this?? */
    - .id = {
    - .bustype = BUS_HOST,
    - },
    -};
    +static struct input_dev *awacs_beep_dev;

    int __init dmasound_awacs_init(void)
    {
    @@ -3140,14 +3131,22 @@ printk("dmasound_pmac: Awacs/Screamer Co
    * XXX: we should handle errors here, but that would mean
    * rewriting the whole init code. later..
    */
    - input_register_device(&awacs_beep_dev);
    + awacs_beep_dev = input_allocate_device();
    + awacs_beep_dev->name = "dmasound beeper";
    + awacs_beep_dev->phys = "macio/input0";
    + awacs_beep_dev->id.bustype = BUS_HOST;
    + awacs_beep_dev->event = awacs_beep_event;
    + awacs_beep_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
    + awacs_beep_dev->evbit[0] = BIT(EV_SND);
    +
    + input_register_device(awacs_beep_dev);

    return dmasound_init();
    }

    static void __exit dmasound_awacs_cleanup(void)
    {
    - input_unregister_device(&awacs_beep_dev);
    + input_unregister_device(awacs_beep_dev);

    switch (awacs_revision) {
    case AWACS_TUMBLER:[unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2005-11-01 03:06    [W:0.025 / U:0.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site