svn commit: r222006 - stable/7/sys/cam/scsi

[Andriy Gapon]

Author: avg
Date: Tue May 17 07:16:35 2011
New Revision: 222006
URL: http://svn.freebsd.org/changeset/base/222006

Log:
  MFC r221585: scsi_cd: silence READ_TOC errors in CDIOREADTOCHEADER ioctl

Modified:
  stable/7/sys/cam/scsi/scsi_cd.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/cam/scsi/scsi_cd.c
==============================================================================
--- stable/7/sys/cam/scsi/scsi_cd.c	Tue May 17 07:08:53 2011	(r222005)
+++ stable/7/sys/cam/scsi/scsi_cd.c	Tue May 17 07:16:35 2011	(r222006)
@@ -2120,7 +2120,7 @@ cdioctl(struct disk *dp, u_long cmd, voi
 				  ("trying to do CDIOREADTOCHEADER\n"));
 
 			error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, 
-				          sizeof (*th), /*sense_flags*/0);
+				          sizeof (*th), /*sense_flags*/SF_NO_PRINT);
 			if (error) {
 				free(th, M_SCSICD);
 				cam_periph_unlock(periph);