misc/154152: BKTR memory leak fix, MFC

[Benjamin Close]

>Number:         154152
>Category:       misc
>Synopsis:       BKTR memory leak fix, MFC
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 19 23:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Benjamin Close
>Release:        FreeBSD 8
>Organization:
>Environment:
>Description:
Below is details of an MFC that needs to take place. I have handed in my src commit bit and hence are no longer able to perform the MFC. If a kind src developer is able to perform the MFC it would be great.

Dear Benjamin Close,

As you have requested, I would like to notify you that you have
committed a change that may be MFC'ed now, as a testing period
specified at the time of that commit is over.

For reference purposes following is a copy of your original
commit message.

Regards,

Maxim "MFC Reminder" Sobolev
P.S. Please contact Maxim Sobolev <sobomax at FreeBSD.org> if you
believe that you received this message due to an error.

Author: benjsc
Date: Tue May 26 03:56:56 2009
New Revision: 192784
URL: http://svn.freebsd.org/changeset/base/192784

Log:
  Free the memory correctly in the error case
  
  Submitted by:	frtzkatz at yahoo.com
  Approved by:	sam
  MFC after:	1 month

Modified:
  head/sys/dev/bktr/bktr_os.c

Modified: head/sys/dev/bktr/bktr_os.c
==============================================================================
--- head/sys/dev/bktr/bktr_os.c	Tue May 26 03:45:58 2009	(r192783)
+++ head/sys/dev/bktr/bktr_os.c	Tue May 26 03:56:56 2009	(r192784)
@@ -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_MEM, bktr->mem_rid, bktr->res_mem);
 	return error;
 
 }

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
>Unformatted: