← Back to branch summary

~ubuntu-branches/ubuntu/maverick/alsa-lib/maverick-updates

« back to all changes in this revision

Viewing changes to src/control/namehint.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2010-10-03 14:56:12 UTC
  • Revision ID: james.westby@ubuntu.com-20101003145612-162wm388mt1ttbpd
Tags: 1.0.23-1ubuntu2.1
https://launchpad.net/bugs/652035
https://launchpad.net/bugs/652035
https://launchpad.net/bugs/425362
* lp652035-fix-missing-hw-devices.patch: Apply upstream git changesets
  0244370 and c049d48 to help fix LP: #652035.
* lp652035-use-extended-namehints.patch: Show hints for non-standard
  devices that lack configuration files.  This patch is also required
  to help fix LP: #652035 and by consequence also addresses
  LP: #425362.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/control/namehint.c
439
439
                        err = next_devices[list->iface](list->ctl, &device);
440
440
                        if (device < 0)
441
441
                                err = -EINVAL;
 
442
                        else
 
443
                                max_device = device;
442
444
                        while (err >= 0 && device >= 0) {
443
445
                                err = next_devices[list->iface](list->ctl, &device);
444
 
                                if (device > max_device)
 
446
                                if (err >= 0 && device > max_device)
445
447
                                        max_device = device;
446
 
                                ok++;
447
448
                        }
448
449
                        ok = 0;
449
 
                        for (device = 0; err >= 0 && device < max_device; device++) {
 
450
                        for (device = 0; err >= 0 && device <= max_device; device++) {
450
451
                                list->device = device;
451
452
                                err = try_config(list, list->siface, str);
452
453
                                if (err < 0)