VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / sound / ppc / pmac.c

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 95dfeef..6b307b0 100644 (file)
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -896,7 +896,7 @@ static int __init snd_pmac_detect(pmac_t *chip)
                sound = sound->next;
        if (! sound)
                return -ENODEV;
-       prop = (unsigned int *) get_property(sound, "sub-frame", 0);
+       prop = (unsigned int *) get_property(sound, "sub-frame", NULL);
        if (prop && *prop < 16)
                chip->subframe = *prop;
        /* This should be verified on older screamers */
@@ -931,7 +931,14 @@ static int __init snd_pmac_detect(pmac_t *chip)
                chip->freq_table = tumbler_freqs;
                chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
        }
-       prop = (unsigned int *)get_property(sound, "device-id", 0);
+       if (device_is_compatible(sound, "AOAKeylargo")) {
+               /* Seems to support the stock AWACS frequencies, but has
+                  a snapper mixer */
+               chip->model = PMAC_SNAPPER;
+               // chip->can_byte_swap = 0; /* FIXME: check this */
+               chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
+       }
+       prop = (unsigned int *)get_property(sound, "device-id", NULL);
        if (prop)
                chip->device_id = *prop;
        chip->has_iic = (find_devices("perch") != NULL);