← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to sound/oss/msnd_pinnacle.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft
  • Date: 2012-06-21 09:16:38 UTC
  • Revision ID: package-import@ubuntu.com-20120621091638-gubhv4nox8xez1ct
Tags: 3.5.0-1.1
[ Andy Whitcroft]

* Rebuild lowlatency against Ubuntu-3.5.0-1.1
* All new configuration system to allow configuration deltas to be
  exposed via debian.lowlatency/config-delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/oss/msnd_pinnacle.c
1294
1294
 
1295
1295
static int upload_dsp_code(void)
1296
1296
{
 
1297
        int ret = 0;
 
1298
 
1297
1299
        msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);
1298
1300
#ifndef HAVE_DSPCODEH
1299
1301
        INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE);
1312
1314
        memcpy_toio(dev.base, PERMCODE, PERMCODESIZE);
1313
1315
        if (msnd_upload_host(&dev, INITCODE, INITCODESIZE) < 0) {
1314
1316
                printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n");
1315
 
                return -ENODEV;
 
1317
                ret = -ENODEV;
 
1318
                goto out;
1316
1319
        }
1317
1320
#ifdef HAVE_DSPCODEH
1318
1321
        printk(KERN_INFO LOGNAME ": DSP firmware uploaded (resident)\n");
1320
1323
        printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n");
1321
1324
#endif
1322
1325
 
 
1326
out:
1323
1327
#ifndef HAVE_DSPCODEH
1324
1328
        vfree(INITCODE);
1325
1329
        vfree(PERMCODE);
1326
1330
#endif
1327
1331
 
1328
 
        return 0;
 
1332
        return ret;
1329
1333
}
1330
1334
 
1331
1335
#ifdef MSND_CLASSIC
1631
1635
static int joystick_io __initdata = 0;
1632
1636
 
1633
1637
/* If we have the digital daugherboard... */
1634
 
static int digital __initdata = 0;
 
1638
static bool digital __initdata = false;
1635
1639
#endif
1636
1640
 
1637
1641
static int fifosize __initdata =        DEFFIFOSIZE;
1701
1705
#ifndef CONFIG_MSNDPIN_DIGITAL
1702
1706
#  define CONFIG_MSNDPIN_DIGITAL        0
1703
1707
#endif
1704
 
static int digital __initdata =         CONFIG_MSNDPIN_DIGITAL;
 
1708
static bool digital __initdata =        CONFIG_MSNDPIN_DIGITAL;
1705
1709
 
1706
1710
#endif /* MSND_CLASSIC */
1707
1711