[PARISC] Convert parisc_device to use struct resource for hpa
[linux-2.6.git] / sound / parisc / harmony.c
index d7a8f9f..8b3ea26 100644 (file)
@@ -852,14 +852,14 @@ snd_harmony_create(snd_card_t *card,
        memset(&h->pbuf, 0, sizeof(h->pbuf));
        memset(&h->cbuf, 0, sizeof(h->cbuf));
 
-       h->hpa = padev->hpa;
+       h->hpa = padev->hpa.start;
        h->card = card;
        h->dev = padev;
        h->irq = padev->irq;
-       h->iobase = ioremap_nocache(padev->hpa, HARMONY_SIZE);
+       h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);
        if (h->iobase == NULL) {
                printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
-                      padev->hpa);
+                      padev->hpa.start);
                err = -EBUSY;
                goto free_and_ret;
        }
@@ -880,6 +880,8 @@ snd_harmony_create(snd_card_t *card,
                 goto free_and_ret;
         }
 
+       snd_card_set_dev(card, &padev->dev);
+
        *rchip = h;
 
        return 0;