svn commit: r234670 - stable/8/sys/cam/ata

[Alexander Motin]

Author: mav
Date: Wed Apr 25 06:22:22 2012
New Revision: 234670
URL: http://svn.freebsd.org/changeset/base/234670

Log:
  MFC r234414:
  Alike to SCSI make adaclose() to not return error if device gone.
  This fixes KASSERT panic inside GEOM if kernel built with INVARIANTS.

Modified:
  stable/8/sys/cam/ata/ata_da.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/cam/ata/ata_da.c
==============================================================================
--- stable/8/sys/cam/ata/ata_da.c	Wed Apr 25 06:18:49 2012	(r234669)
+++ stable/8/sys/cam/ata/ata_da.c	Wed Apr 25 06:22:22 2012	(r234670)
@@ -432,17 +432,16 @@ adaclose(struct disk *dp)
 	struct	cam_periph *periph;
 	struct	ada_softc *softc;
 	union ccb *ccb;
-	int error;
 
 	periph = (struct cam_periph *)dp->d_drv1;
 	if (periph == NULL)
 		return (ENXIO);	
 
 	cam_periph_lock(periph);
-	if ((error = cam_periph_hold(periph, PRIBIO)) != 0) {
+	if (cam_periph_hold(periph, PRIBIO) != 0) {
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
-		return (error);
+		return (0);
 	}
 
 	softc = (struct ada_softc *)periph->softc;