svn commit: r217661 - stable/7/sys/dev/bktr

[Pyun YongHyeon]

Author: yongari
Date: Thu Jan 20 21:25:16 2011
New Revision: 217661
URL: http://svn.freebsd.org/changeset/base/217661

Log:
  MFC r192784,192805:
    Free the memory correctly in the error case
  
    PR:	misc/154152

Modified:
  stable/7/sys/dev/bktr/bktr_os.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/bktr/bktr_os.c
==============================================================================
--- stable/7/sys/dev/bktr/bktr_os.c	Thu Jan 20 21:11:45 2011	(r217660)
+++ stable/7/sys/dev/bktr/bktr_os.c	Thu Jan 20 21:25:16 2011	(r217661)
@@ -470,7 +470,7 @@ fail:
 	if (bktr->res_irq)
 		bus_release_resource(dev, SYS_RES_IRQ, bktr->irq_rid, bktr->res_irq);
 	if (bktr->res_mem)
-		bus_release_resource(dev, SYS_RES_IRQ, bktr->mem_rid, bktr->res_mem);
+		bus_release_resource(dev, SYS_RES_MEMORY, bktr->mem_rid, bktr->res_mem);
 	return error;
 
 }