ATAng regression: cdcontrol close not working

[Lars Eggert]

Soren Schmidt wrote:
> 
> Anyhow if you loose the test for error in atapi-cd.c::acd_tray in the
> close case, does it work then ?

If you mean as below, no, that didn't help:

Index: atapi-cd.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/atapi-cd.c,v
retrieving revision 1.149
diff -u -r1.149 atapi-cd.c
--- atapi-cd.c  18 Oct 2003 17:24:51 -0000      1.149
+++ atapi-cd.c  30 Oct 2003 21:31:23 -0000
@@ -1884,11 +1884,10 @@

      if (cdp->cap.mechanism & MST_EJECT) {
         if (close) {
-           if (!(error = acd_start_stop(cdp, 3))) {
-               acd_read_toc(cdp);
-               acd_prevent_allow(cdp, 1);
-               cdp->flags |= F_LOCKED;
-           }
+            error = acd_start_stop(cdp, 3);
+           acd_read_toc(cdp);
+           acd_prevent_allow(cdp, 1);
+           cdp->flags |= F_LOCKED;
         }
         else {
             acd_start_stop(cdp, 0);

Lars
-- 
Lars Eggert <larse at isi.edu>           USC Information Sciences Institute
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3529 bytes
Desc: S/MIME Cryptographic Signature
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20031030/e72cbf9c/smime.bin