X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fppc%2Fpmac.c;h=4f80fec4f5c7cfd0b3e5c19c3cfdd37156477fe1;hb=08559aee03be26f1300e0b97f98cf5975095ec7a;hp=6b307b064598f62a66821dd9fb6f0a3a384e56fc;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 6b307b064..4f80fec4f 100644
--- 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", NULL);
+	prop = (unsigned int *) get_property(sound, "sub-frame", 0);
 	if (prop && *prop < 16)
 		chip->subframe = *prop;
 	/* This should be verified on older screamers */
@@ -938,7 +938,7 @@ static int __init snd_pmac_detect(pmac_t *chip)
 		// 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);
+	prop = (unsigned int *)get_property(sound, "device-id", 0);
 	if (prop)
 		chip->device_id = *prop;
 	chip->has_iic = (find_devices("perch") != NULL);