X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=ff6f89e16375966094de7c4383f0e0a70675ce7e;hb=c1bf1edeb726dc2cdedca5358f9b9cd88db72697;hp=c561112d3063f72d697e2aa2d8d7415b7a959a50;hpb=fc046d4d08f686bcdb91c015b5b35c35e2c205a0;p=elogind.git

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index c561112d3..ff6f89e16 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -7,9 +7,6 @@
  *	under the terms of the GNU General Public License as published by the
  *	Free Software Foundation version 2 of the License.
  *
- * Framework based on ata_id which is:
- *	Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
  */
 
 #ifndef _GNU_SOURCE
@@ -107,21 +104,21 @@ int main(int argc, char *argv[])
 			node = arg;
 	}
 	if (!node) {
-		err("no node specified");
+		info("no node specified");
 		rc = 1;
 		goto exit;
 	}
 
 	fd = open(node, O_RDONLY|O_NONBLOCK);
 	if (fd < 0) {
-		err("unable to open '%s'", node);
+		info("unable to open '%s'", node);
 		rc = 1;
 		goto exit;
 	}
 
 	result = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
 	if (result < 0) {
-		err("CDROM_GET_CABILITY failed for '%s'", node);
+		info("CDROM_GET_CAPABILITY failed for '%s'", node);
 		rc = 3;
 		goto close;
 	}
@@ -147,8 +144,6 @@ int main(int argc, char *argv[])
 
 	if (result & CDC_RAM)
 		printf("ID_CDROM_RAM=1\n");
-	goto close;
-
 close:
 	close(fd);
 exit: