← Back to branch summary

~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to alsa-kernel/soc/blackfin/bf5xx-ssm2602.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-11-04 16:28:58 UTC
  • mfrom: (1.1.12 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104162858-7ky0tu33d7mn6oys
Tags: 1.0.21+dfsg-3ubuntu1
* Merge from debian unstable, remaining changes:
  - Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
  - debian/rules:
    + Don't install snddevices and program-wrapper
    + install alsa-base apport hook
    + Package separate USB card list file
  - Vcs and maintainer fields mangling
  - Rename blacklist files in /etc/modprobe.d to be consistant with the rest
    of the distro
  - debian/alsa-base.init:
    + create /var/run/alsa if it doesn't exist
    + Run alsactl store before force unloading modules
    + Run alsactl restore after reloading unloaded modules
  - debian/linux-sound-base.postrm: Remove /etc/modprobe.d/blacklist* files
    on package removal
  - Add missing $CMDLINE_OPTS to all install rules.
  - Replace -Q with --quiet.
  - Add --use-blacklist to all rules so the blacklist still takes effect.
  - debian/alsa-base.postinst: Do not run snddevices
  - retain patches:
    + add_suspend_quirk_hp_nc6220_nw8240.patch,
    + refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
alsa-kernel/soc/blackfin/bf5xx-ssm2602.c
148
148
        .codec_data = &bf5xx_ssm2602_setup,
149
149
};
150
150
 
151
 
static struct platform_device *bf52x_ssm2602_snd_device;
 
151
static struct platform_device *bf5xx_ssm2602_snd_device;
152
152
 
153
153
static int __init bf5xx_ssm2602_init(void)
154
154
{
155
155
        int ret;
156
156
 
157
157
        pr_debug("%s enter\n", __func__);
158
 
        bf52x_ssm2602_snd_device = platform_device_alloc("soc-audio", -1);
159
 
        if (!bf52x_ssm2602_snd_device)
 
158
        bf5xx_ssm2602_snd_device = platform_device_alloc("soc-audio", -1);
 
159
        if (!bf5xx_ssm2602_snd_device)
160
160
                return -ENOMEM;
161
161
 
162
 
        platform_set_drvdata(bf52x_ssm2602_snd_device,
 
162
        platform_set_drvdata(bf5xx_ssm2602_snd_device,
163
163
                                &bf5xx_ssm2602_snd_devdata);
164
 
        bf5xx_ssm2602_snd_devdata.dev = &bf52x_ssm2602_snd_device->dev;
165
 
        ret = platform_device_add(bf52x_ssm2602_snd_device);
 
164
        bf5xx_ssm2602_snd_devdata.dev = &bf5xx_ssm2602_snd_device->dev;
 
165
        ret = platform_device_add(bf5xx_ssm2602_snd_device);
166
166
 
167
167
        if (ret)
168
 
                platform_device_put(bf52x_ssm2602_snd_device);
 
168
                platform_device_put(bf5xx_ssm2602_snd_device);
169
169
 
170
170
        return ret;
171
171
}
173
173
static void __exit bf5xx_ssm2602_exit(void)
174
174
{
175
175
        pr_debug("%s enter\n", __func__);
176
 
        platform_device_unregister(bf52x_ssm2602_snd_device);
 
176
        platform_device_unregister(bf5xx_ssm2602_snd_device);
177
177
}
178
178
 
179
179
module_init(bf5xx_ssm2602_init);