diff --git a/ChangeLog b/ChangeLog
index a455d9b6b..ad72c8da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  David Volgyes <dvolgyes>
+
+	* grub-core/bus/usb/ohci.c (grub_ohci_pci_iter): Avoid NULL-pointer
+	dereference.
+
 2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix spurious warning.
diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c
index df0d0f4af..7e8eaaac2 100644
--- a/grub-core/bus/usb/ohci.c
+++ b/grub-core/bus/usb/ohci.c
@@ -454,10 +454,12 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 
  fail:
   if (o)
-    grub_dma_free (o->td_chunk);
-    grub_dma_free (o->ed_bulk_chunk);
-    grub_dma_free (o->ed_ctrl_chunk);
-    grub_dma_free (o->hcca_chunk);
+    {
+      grub_dma_free (o->td_chunk);
+      grub_dma_free (o->ed_bulk_chunk);
+      grub_dma_free (o->ed_ctrl_chunk);
+      grub_dma_free (o->hcca_chunk);
+    }
   grub_free (o);
 
   return 0;