Ignore:
Timestamp:
Aug 21, 2021, 3:35:34 AM (4 years ago)
Author:
David Azarewicz
Message:

Merge changes from next branch.

Location:
GPL/trunk
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk

  • GPL/trunk/alsa-kernel/isa/ad1816a/ad1816a.c

    r679 r695  
    2323MODULE_DESCRIPTION("AD1816A, AD1815");
    2424MODULE_LICENSE("GPL");
    25 MODULE_SUPPORTED_DEVICE("{{Highscreen,Sound-Boostar 16 3D},"
    26                 "{Analog Devices,AD1815},"
    27                 "{Analog Devices,AD1816A},"
    28                 "{TerraTec,Base 64},"
    29                 "{TerraTec,AudioSystem EWS64S},"
    30                 "{Aztech/Newcom SC-16 3D},"
    31                 "{Shark Predator ISA}}");
    3225
    3326static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 1-MAX */

  • GPL/trunk/alsa-kernel/isa/ad1848/ad1848.c

    r679 r695  
    2323MODULE_AUTHOR("Tugrul Galatali <galatalt@stuy.edu>, Jaroslav Kysela <perex@perex.cz>");
    2424MODULE_LICENSE("GPL");
    25 MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1848},"
    26                 "{Analog Devices,AD1847},"
    27                 "{Crystal Semiconductors,CS4248}}");
    2825
    2926static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    9693                goto out;
    9794
    98         strlcpy(card->driver, "AD1848", sizeof(card->driver));
    99         strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
     95        strscpy(card->driver, "AD1848", sizeof(card->driver));
     96        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
    10097
    10198        if (!thinkpad[n])
    … …  
    119116}
    120117
    121 static int snd_ad1848_remove(struct device *dev, unsigned int n)
     118static void snd_ad1848_remove(struct device *dev, unsigned int n)
    122119{
    123120        snd_card_free(dev_get_drvdata(dev));
    124         return 0;
    125121}
    126122

  • GPL/trunk/alsa-kernel/isa/adlib.c

    r679 r695  
    9898}
    9999
    100 static int snd_adlib_remove(struct device *dev, unsigned int n)
     100static void snd_adlib_remove(struct device *dev, unsigned int n)
    101101{
    102102        snd_card_free(dev_get_drvdata(dev));
    103         return 0;
    104103}
    105104

  • GPL/trunk/alsa-kernel/isa/als100.c

    r679 r695  
    2727
    2828MODULE_DESCRIPTION("Avance Logic ALS007/ALS1X0");
    29 MODULE_SUPPORTED_DEVICE("{{Diamond Technologies DT-019X},"
    30                 "{Avance Logic ALS-007}}"
    31                 "{{Avance Logic,ALS100 - PRO16PNP},"
    32                 "{Avance Logic,ALS110},"
    33                 "{Avance Logic,ALS120},"
    34                 "{Avance Logic,ALS200},"
    35                 "{3D Melody,MF1000},"
    36                 "{Digimate,3D Sound},"
    37                 "{Avance Logic,ALS120},"
    38                 "{RTL,RTL3000}}");
    39 
    4029MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
    4130MODULE_LICENSE("GPL");

  • GPL/trunk/alsa-kernel/isa/azt2320.c

    r679 r695  
    3636MODULE_DESCRIPTION("Aztech Systems AZT2320");
    3737MODULE_LICENSE("GPL");
    38 MODULE_SUPPORTED_DEVICE("{{Aztech Systems,PRO16V},"
    39                 "{Aztech Systems,AZT2320},"
    40                 "{Aztech Systems,AZT3300},"
    41                 "{Aztech Systems,AZT2320},"
    42                 "{Aztech Systems,AZT3000}}");
    4338
    4439static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */

  • GPL/trunk/alsa-kernel/isa/cmi8328.c

    r679 r695  
    404404}
    405405
    406 static int snd_cmi8328_remove(struct device *pdev, unsigned int dev)
     406static void snd_cmi8328_remove(struct device *pdev, unsigned int dev)
    407407{
    408408        struct snd_card *card = dev_get_drvdata(pdev);
    … …  
    421421        snd_cmi8328_cfg_write(cmi->port, CFG3, 0);
    422422        snd_card_free(card);
    423         return 0;
    424423}
    425424

  • GPL/trunk/alsa-kernel/isa/cmi8330.c

    r679 r695  
    5252MODULE_DESCRIPTION("C-Media CMI8330/CMI8329");
    5353MODULE_LICENSE("GPL");
    54 MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");
    5554
    5655static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
    … …  
    549548        if (acard->sb->hardware != SB_HW_16) {
    550549                snd_printk(KERN_ERR PFX "SB16 not found during probe\n");
    551                 return err;
     550                return -ENODEV;
    552551        }
    553552
    … …  
    632631}
    633632
    634 static int snd_cmi8330_isa_remove(struct device *devptr,
     633static void snd_cmi8330_isa_remove(struct device *devptr,
    635634                                  unsigned int dev)
    636635{
    637636        snd_card_free(dev_get_drvdata(devptr));
    638         return 0;
    639637}
    640638

  • GPL/trunk/alsa-kernel/isa/cs423x/cs4231.c

    r679 r695  
    2424MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
    2525MODULE_LICENSE("GPL");
    26 MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4231}}");
    2726
    2827static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    9695                goto out;
    9796
    98         strlcpy(card->driver, "CS4231", sizeof(card->driver));
    99         strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
     97        strscpy(card->driver, "CS4231", sizeof(card->driver));
     98        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
    10099
    101100        if (dma2[n] < 0)
    … …  
    136135}
    137136
    138 static int snd_cs4231_remove(struct device *dev, unsigned int n)
     137static void snd_cs4231_remove(struct device *dev, unsigned int n)
    139138{
    140139        snd_card_free(dev_get_drvdata(dev));
    141         return 0;
    142140}
    143141

  • GPL/trunk/alsa-kernel/isa/cs423x/cs4236.c

    r679 r695  
    1919MODULE_LICENSE("GPL");
    2020MODULE_DESCRIPTION("Cirrus Logic CS4232-9");
    21 MODULE_SUPPORTED_DEVICE("{{Turtle Beach,TBS-2000},"
    22                 "{Turtle Beach,Tropez Plus},"
    23                 "{SIC CrystalWave 32},"
    24                 "{Hewlett Packard,Omnibook 5500},"
    25                 "{TerraTec,Maestro 32/96},"
    26                 "{Philips,PCA70PS}},"
    27                 "{{Crystal Semiconductors,CS4235},"
    28                 "{Crystal Semiconductors,CS4236},"
    29                 "{Crystal Semiconductors,CS4237},"
    30                 "{Crystal Semiconductors,CS4238},"
    31                 "{Crystal Semiconductors,CS4239},"
    32                 "{Acer,AW37},"
    33                 "{Acer,AW35/Pro},"
    34                 "{Crystal,3D},"
    35                 "{Crystal Computer,TidalWave128},"
    36                 "{Dell,Optiplex GX1},"
    37                 "{Dell,Workstation 400 sound},"
    38                 "{EliteGroup,P5TX-LA sound},"
    39                 "{Gallant,SC-70P},"
    40                 "{Gateway,E1000 Onboard CS4236B},"
    41                 "{Genius,Sound Maker 3DJ},"
    42                 "{Hewlett Packard,HP6330 sound},"
    43                 "{IBM,PC 300PL sound},"
    44                 "{IBM,Aptiva 2137 E24},"
    45                 "{IBM,IntelliStation M Pro},"
    46                 "{Intel,Marlin Spike Mobo CS4235},"
    47                 "{Intel PR440FX Onboard},"
    48                 "{Guillemot,MaxiSound 16 PnP},"
    49                 "{NewClear,3D},"
    50                 "{TerraTec,AudioSystem EWS64L/XL},"
    51                 "{Typhoon Soundsystem,CS4236B},"
    52                 "{Turtle Beach,Malibu},"
    53                 "{Unknown,Digital PC 5000 Onboard}}");
    54 
    5521MODULE_ALIAS("snd_cs4232");
    5622
    … …  
    406372                        return err;
    407373        }
    408         strlcpy(card->driver, chip->pcm->name, sizeof(card->driver));
    409         strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
     374        strscpy(card->driver, chip->pcm->name, sizeof(card->driver));
     375        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
    410376        if (dma2[dev] < 0)
    411377                snprintf(card->longname, sizeof(card->longname),
    … …  
    488454}
    489455
    490 static int snd_cs423x_isa_remove(struct device *pdev,
     456static void snd_cs423x_isa_remove(struct device *pdev,
    491457                                 unsigned int dev)
    492458{
    493459        snd_card_free(dev_get_drvdata(pdev));
    494         return 0;
    495460}
    496461

  • GPL/trunk/alsa-kernel/isa/es1688/es1688.c

    r679 r695  
    2727MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
    2828MODULE_LICENSE("GPL");
    29 MODULE_SUPPORTED_DEVICE("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100},"
    30                 "{ESS,ES1688 PnP AudioDrive,pnp:ESS0102},"
    31                 "{ESS,ES688 AudioDrive,pnp:ESS6881},"
    32                 "{ESS,ES1688 AudioDrive,pnp:ESS1681}}");
    33 
    3429MODULE_ALIAS("snd_es968");
    3530
    … …  
    134129                return error;
    135130
    136         strlcpy(card->driver, "ES1688", sizeof(card->driver));
    137         strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
     131        strscpy(card->driver, "ES1688", sizeof(card->driver));
     132        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
    138133        snprintf(card->longname, sizeof(card->longname),
    139134                "%s at 0x%lx, irq %i, dma %i", chip->pcm->name, chip->port,
    … …  
    193188}
    194189
    195 static int snd_es1688_isa_remove(struct device *dev, unsigned int n)
     190static void snd_es1688_isa_remove(struct device *dev, unsigned int n)
    196191{
    197192        snd_card_free(dev_get_drvdata(dev));
    198         return 0;
    199193}
    200194

  • GPL/trunk/alsa-kernel/isa/es18xx.c

    r679 r695  
    19301930/* Card level */
    19311931
    1932 MODULE_AUTHOR("Christian Fischbach <fishbach@pool.informatik.rwth-aachen.de>, Abramo Bagnara <abramo@alsa-project.org>"); 
     1932MODULE_AUTHOR("Christian Fischbach <fishbach@pool.informatik.rwth-aachen.de>, Abramo Bagnara <abramo@alsa-project.org>");
    19331933MODULE_DESCRIPTION("ESS ES18xx AudioDrive");
    19341934MODULE_LICENSE("GPL");
    1935 MODULE_SUPPORTED_DEVICE("{{ESS,ES1868 PnP AudioDrive},"
    1936                 "{ESS,ES1869 PnP AudioDrive},"
    1937                 "{ESS,ES1878 PnP AudioDrive},"
    1938                 "{ESS,ES1879 PnP AudioDrive},"
    1939                 "{ESS,ES1887 PnP AudioDrive},"
    1940                 "{ESS,ES1888 PnP AudioDrive},"
    1941                 "{ESS,ES1887 AudioDrive},"
    1942                 "{ESS,ES1888 AudioDrive}}");
    19431935
    19441936static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    22112203}
    22122204
    2213 static int snd_es18xx_isa_remove(struct device *devptr,
    2214                                  unsigned int dev)
     2205static void snd_es18xx_isa_remove(struct device *devptr,
     2206                                  unsigned int dev)
    22152207{
    22162208        snd_card_free(dev_get_drvdata(devptr));
    2217         return 0;
    22182209}
    22192210

  • GPL/trunk/alsa-kernel/isa/gus/gusclassic.c

    r679 r695  
    2424MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
    2525MODULE_LICENSE("GPL");
    26 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Classic}}");
    2726
    2827static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    196195}
    197196
    198 static int snd_gusclassic_remove(struct device *dev, unsigned int n)
     197static void snd_gusclassic_remove(struct device *dev, unsigned int n)
    199198{
    200199        snd_card_free(dev_get_drvdata(dev));
    201         return 0;
    202200}
    203201

  • GPL/trunk/alsa-kernel/isa/gus/gusextreme.c

    r679 r695  
    2828MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
    2929MODULE_LICENSE("GPL");
    30 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Extreme}}");
    3130
    3231static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    325324}
    326325
    327 static int snd_gusextreme_remove(struct device *dev, unsigned int n)
     326static void snd_gusextreme_remove(struct device *dev, unsigned int n)
    328327{
    329328        snd_card_free(dev_get_drvdata(dev));
    330         return 0;
    331329}
    332330

  • GPL/trunk/alsa-kernel/isa/gus/gusmax.c

    r679 r695  
    2222MODULE_DESCRIPTION("Gravis UltraSound MAX");
    2323MODULE_LICENSE("GPL");
    24 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound MAX}}");
    2524
    2625static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    339338}
    340339
    341 static int snd_gusmax_remove(struct device *devptr, unsigned int dev)
     340static void snd_gusmax_remove(struct device *devptr, unsigned int dev)
    342341{
    343342        snd_card_free(dev_get_drvdata(devptr));
    344         return 0;
    345343}
    346344

  • GPL/trunk/alsa-kernel/isa/gus/interwave.c

    r679 r695  
    2929#ifndef SNDRV_STB
    3030MODULE_DESCRIPTION("AMD InterWave");
    31 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Plug & Play},"
    32                 "{STB,SoundRage32},"
    33                 "{MED,MED3210},"
    34                 "{Dynasonix,Dynasonix Pro},"
    35                 "{Panasonic,PCA761AW}}");
    3631#else
    3732MODULE_DESCRIPTION("AMD InterWave STB with TEA6330T");
    38 MODULE_SUPPORTED_DEVICE("{{AMD,InterWave STB with TEA6330T}}");
    3933#endif
    4034
    … …  
    826820}
    827821
    828 static int snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
     822static void snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
    829823{
    830824        snd_card_free(dev_get_drvdata(devptr));
    831         return 0;
    832825}
    833826

  • GPL/trunk/alsa-kernel/isa/opl3sa2.c

    r679 r695  
    2323MODULE_DESCRIPTION("Yamaha OPL3SA2+");
    2424MODULE_LICENSE("GPL");
    25 MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF719E-S},"
    26                 "{Genius,Sound Maker 3DX},"
    27                 "{Yamaha,OPL3SA3},"
    28                 "{Intel,AL440LX sound},"
    29                 "{NeoMagic,MagicWave 3DX}}");
    3025
    3126static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    883878}
    884879
    885 static int snd_opl3sa2_isa_remove(struct device *devptr,
     880static void snd_opl3sa2_isa_remove(struct device *devptr,
    886881                                  unsigned int dev)
    887882{
    888883        snd_card_free(dev_get_drvdata(devptr));
    889         return 0;
    890884}
    891885

  • GPL/trunk/alsa-kernel/isa/opti9xx/opti92x-ad1848.c

    r679 r695  
    3737#ifdef OPTi93X
    3838MODULE_DESCRIPTION("OPTi93X");
    39 MODULE_SUPPORTED_DEVICE("{{OPTi,82C931/3}}");
    4039#else   /* OPTi93X */
    4140#ifdef CS4231
    4241MODULE_DESCRIPTION("OPTi92X - CS4231");
    43 MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (CS4231)},"
    44                 "{OPTi,82C925 (CS4231)}}");
    4542#else   /* CS4231 */
    4643MODULE_DESCRIPTION("OPTi92X - AD1848");
    47 MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)},"
    48                 "{OPTi,82C925 (AD1848)},"
    49                 "{OAK,Mozart}}");
    5044#endif  /* CS4231 */
    5145#endif  /* OPTi93X */
    … …  
    10251019}
    10261020
    1027 static int snd_opti9xx_isa_remove(struct device *devptr,
    1028                                   unsigned int dev)
     1021static void snd_opti9xx_isa_remove(struct device *devptr,
     1022                                   unsigned int dev)
    10291023{
    10301024        snd_card_free(dev_get_drvdata(devptr));
    1031         return 0;
    10321025}
    10331026

  • GPL/trunk/alsa-kernel/isa/sb/jazz16.c

    r679 r695  
    2929
    3030MODULE_DESCRIPTION("Media Vision Jazz16");
    31 MODULE_SUPPORTED_DEVICE("{{Media Vision ??? },"
    32                 "{RTL,RTL3000}}");
    33 
    3431MODULE_AUTHOR("Krzysztof Helt <krzysztof.h1@wp.pl>");
    3532MODULE_LICENSE("GPL");
    … …  
    340337}
    341338
    342 static int snd_jazz16_remove(struct device *devptr, unsigned int dev)
     339static void snd_jazz16_remove(struct device *devptr, unsigned int dev)
    343340{
    344341        struct snd_card *card = dev_get_drvdata(devptr);
    345342
    346343        snd_card_free(card);
    347         return 0;
    348344}
    349345

  • GPL/trunk/alsa-kernel/isa/sb/sb16.c

    r679 r695  
    3232#ifndef SNDRV_SBAWE
    3333MODULE_DESCRIPTION("Sound Blaster 16");
    34 MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB 16},"
    35                 "{Creative Labs,SB Vibra16S},"
    36                 "{Creative Labs,SB Vibra16C},"
    37                 "{Creative Labs,SB Vibra16CL},"
    38                 "{Creative Labs,SB Vibra16X}}");
    3934#else
    4035MODULE_DESCRIPTION("Sound Blaster AWE");
    41 MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB AWE 32},"
    42                 "{Creative Labs,SB AWE 64},"
    43                 "{Creative Labs,SB AWE 64 Gold}}");
    4436#endif
    4537
    … …  
    548540}
    549541
    550 static int snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
     542static void snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
    551543{
    552544        snd_card_free(dev_get_drvdata(pdev));
    553         return 0;
    554545}
    555546

  • GPL/trunk/alsa-kernel/isa/sb/sb16_csp.c

    r689 r695  
    390390
    391391                        /* fill in codec header */
    392                         strlcpy(p->codec_name, info.codec_name, sizeof(p->codec_name));
     392                        strscpy(p->codec_name, info.codec_name, sizeof(p->codec_name));
    393393                        p->func_nr = func_nr;
    394394                        p->mode = le16_to_cpu(funcdesc_h.flags_play_rec);
    … …  
    816816        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL & 0x7);
    817817        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR & 0x7);
     818        spin_unlock_irqrestore(&p->chip->mixer_lock, flags);
    818819
    819820        spin_lock(&p->chip->reg_lock);
    … …  
    855856
    856857        /* restore PCM volume */
     858        spin_lock_irqsave(&p->chip->mixer_lock, flags);
    857859        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL);
    858860        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR);
    … …  
    880882        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL & 0x7);
    881883        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR & 0x7);
     884        spin_unlock_irqrestore(&p->chip->mixer_lock, flags);
    882885
    883886        spin_lock(&p->chip->reg_lock);
    … …  
    894897
    895898        /* restore PCM volume */
     899        spin_lock_irqsave(&p->chip->mixer_lock, flags);
    896900        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL);
    897901        snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR);
    … …  
    10741078       
    10751079        down_write(&card->controls_rwsem);
    1076         if (p->qsound_switch)
     1080        if (p->qsound_switch) {
    10771081                snd_ctl_remove(card, p->qsound_switch);
    1078         if (p->qsound_space)
     1082                p->qsound_switch = NULL;
     1083        }
     1084        if (p->qsound_space) {
    10791085                snd_ctl_remove(card, p->qsound_space);
     1086                p->qsound_space = NULL;
     1087        }
    10801088        up_write(&card->controls_rwsem);
    10811089

  • GPL/trunk/alsa-kernel/isa/sb/sb8.c

    r689 r695  
    1818MODULE_DESCRIPTION("Sound Blaster 1.0/2.0/Pro");
    1919MODULE_LICENSE("GPL");
    20 MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB 1.0/SB 2.0/SB Pro}}");
    2120
    2221static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    9594        card->private_free = snd_sb8_free;
    9695
    97         /* block the 0x388 port to avoid PnP conflicts */
     96        /*
     97         * Block the 0x388 port to avoid PnP conflicts.
     98         * No need to check this value after request_region,
     99         * as we never do anything with it.
     100         */
    98101        acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
    99102
    … …  
    189192}
    190193
    191 static int snd_sb8_remove(struct device *pdev, unsigned int dev)
     194static void snd_sb8_remove(struct device *pdev, unsigned int dev)
    192195{
    193196        snd_card_free(dev_get_drvdata(pdev));
    194         return 0;
    195197}
    196198

  • GPL/trunk/alsa-kernel/isa/sb/sb8_main.c

    r679 r695  
    507507                        runtime->hw.rate_max = 15000;
    508508                }
     509                break;
    509510        default:
    510511                break;

  • GPL/trunk/alsa-kernel/isa/sb/sb_mixer.c

    r679 r695  
    483483        if (! ctl)
    484484                return -ENOMEM;
    485         strlcpy(ctl->id.name, name, sizeof(ctl->id.name));
     485        strscpy(ctl->id.name, name, sizeof(ctl->id.name));
    486486        ctl->id.index = index;
    487487        ctl->private_value = value;

  • GPL/trunk/alsa-kernel/isa/sc6000.c

    r679 r695  
    3030MODULE_DESCRIPTION("Gallant SC-6000");
    3131MODULE_LICENSE("GPL");
    32 MODULE_SUPPORTED_DEVICE("{{Gallant, SC-6000},"
    33                         "{AudioExcel, Audio Excel DSP 16},"
    34                         "{Zoltrix, AV302}}");
    3532
    3633static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
    … …  
    673670}
    674671
    675 static int snd_sc6000_remove(struct device *devptr, unsigned int dev)
     672static void snd_sc6000_remove(struct device *devptr, unsigned int dev)
    676673{
    677674        struct snd_card *card = dev_get_drvdata(devptr);
    … …  
    685682
    686683        snd_card_free(card);
    687         return 0;
    688684}
    689685

  • GPL/trunk/alsa-kernel/isa/sscape.c

    r679 r695  
    11841184}
    11851185
    1186 static int snd_sscape_remove(struct device *devptr, unsigned int dev)
     1186static void snd_sscape_remove(struct device *devptr, unsigned int dev)
    11871187{
    11881188        snd_card_free(dev_get_drvdata(devptr));
    1189         return 0;
    11901189}
    11911190

  • GPL/trunk/alsa-kernel/isa/wavefront/wavefront.c

    r679 r695  
    2222MODULE_DESCRIPTION("Turtle Beach Wavefront");
    2323MODULE_LICENSE("GPL");
    24 MODULE_SUPPORTED_DEVICE("{{Turtle Beach,Maui/Tropez/Tropez+}}");
    2524
    2625static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;          /* Index 0-MAX */
    … …  
    566565}
    567566
    568 static int snd_wavefront_isa_remove(struct device *devptr,
     567static void snd_wavefront_isa_remove(struct device *devptr,
    569568                                    unsigned int dev)
    570569{
    571570        snd_card_free(dev_get_drvdata(devptr));
    572         return 0;
    573571}
    574572
Note: See TracChangeset for help on using the changeset viewer.