lkml.org 
[lkml]   [2006]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/12] PNP: adjust pnp_register_card_driver() signature
    Date
    Remove the assumption that pnp_register_card_driver() returns the
    number of devices claimed.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

    Index: work-mm5/sound/isa/dt019x.c
    ===================================================================
    --- work-mm5.orig/sound/isa/dt019x.c 2006-03-22 09:57:34.000000000 -0700
    +++ work-mm5/sound/isa/dt019x.c 2006-03-22 10:13:34.000000000 -0700
    @@ -272,6 +272,8 @@
    return 0;
    }

    +static unsigned int __devinitdata dt019x_devices;
    +
    static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
    const struct pnp_card_device_id *pid)
    {
    @@ -285,6 +287,7 @@
    if (res < 0)
    return res;
    dev++;
    + dt019x_devices++;
    return 0;
    }
    return -ENODEV;
    @@ -336,10 +339,13 @@

    static int __init alsa_card_dt019x_init(void)
    {
    - int cards = 0;
    + int err;
    +
    + err = pnp_register_card_driver(&dt019x_pnpc_driver);
    + if (err)
    + return err;

    - cards = pnp_register_card_driver(&dt019x_pnpc_driver);
    - if (cards <= 0) {
    + if (!dt019x_devices) {
    pnp_unregister_card_driver(&dt019x_pnpc_driver);
    #ifdef MODULE
    snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");
    -
    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/
    \
     
     \ /
      Last update: 2006-03-22 23:17    [W:0.024 / U:60.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site