Changes in uspace/drv/block/pci-ide/pci-ide.c [221daa5:145d4e2e] in mainline

File:

• uspace/drv/block/pci-ide/pci-ide.c (modified) (4 diffs)

uspace/drv/block/pci-ide/pci-ide.c

@@ -150 +150 @@
         ctrl->bmregs_physical = res->bmregs;
 
-        ddf_msg(LVL_NOTE, "Bus master IDE regs I/O address: 0x%lx",
+        ddf_msg(LVL_NOTE, "Bus master IDE regs I/O address: 0x%" PRIxPTR,
             ctrl->bmregs_physical);
 
@@ -186 +186 @@
         bool irq_inited = false;
         ata_params_t params;
-        void *buffer;
+        void *buffer = NULL;
 
         ddf_msg(LVL_DEBUG, "pci_ide_channel_init()");
@@ -294 +294 @@
         return EOK;
 error:
+        if (chan->channel != NULL) {
+                (void) ata_channel_destroy(chan->channel);
+                chan->channel = NULL;
+        }
+        if (buffer != NULL)
+                dmamem_unmap_anonymous(buffer);
         if (irq_inited)
                 pci_ide_fini_irq(chan);
@@ -315 +321 @@
         }
 
+        dmamem_unmap_anonymous(chan->dma_buf);
         pci_ide_fini_irq(chan);
         pci_ide_fini_io(chan);