Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / oss / harmony.c

diff --git a/sound/oss/harmony.c b/sound/oss/harmony.c
index 2f83ac8..591683c 100644 (file)
--- a/sound/oss/harmony.c
+++ b/sound/oss/harmony.c
@@ -310,7 +310,7 @@ static int harmony_detect_rate(int *freq)
        case 32000:     newrate = HARMONY_SR_32KHZ;     break; 
        case 48000:     newrate = HARMONY_SR_48KHZ;     break; 
        case 9600:      newrate = HARMONY_SR_9KHZ;      break; 
-       case 5125:      newrate = HARMONY_SR_5KHZ;      break; 
+       case 5512:      newrate = HARMONY_SR_5KHZ;      break; 
        case 11025:     newrate = HARMONY_SR_11KHZ;     break; 
        case 18900:     newrate = HARMONY_SR_18KHZ;     break; 
        case 22050:     newrate = HARMONY_SR_22KHZ;     break; 
@@ -1236,7 +1236,7 @@ harmony_driver_probe(struct parisc_device *dev)
        }
 
        /* Set the HPA of harmony */
-       harmony.hpa = (struct harmony_hpa *)dev->hpa;
+       harmony.hpa = (struct harmony_hpa *)dev->hpa.start;
        harmony.dev = dev;
 
        /* Grab the ID and revision from the device */
@@ -1250,7 +1250,7 @@ harmony_driver_probe(struct parisc_device *dev)
 
        printk(KERN_INFO "Lasi Harmony Audio driver " HARMONY_VERSION ", "
                        "h/w id %i, rev. %i at 0x%lx, IRQ %i\n",
-                       id, rev, dev->hpa, harmony.dev->irq);
+                       id, rev, dev->hpa.start, harmony.dev->irq);
        
        /* Make sure the control bit isn't set, although I don't think it 
           ever is. */