Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / cdrom / cdrom.c

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index e4c1ae3..cd67fcd 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -901,6 +901,7 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
                                goto err;
                        if (cdrom_open_write(cdi))
                                goto err;
+                       ret = 0;
                }
        }
 
@@ -1476,6 +1477,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
        /* LU data send */
        case DVD_LU_SEND_AGID:
                cdinfo(CD_DVD, "entering DVD_LU_SEND_AGID\n"); 
+               cgc.quiet = 1;
                setup_report_key(&cgc, ai->lsa.agid, 0);
 
                if ((ret = cdo->generic_packet(cdi, &cgc)))
@@ -1510,6 +1512,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
        /* Post-auth key */
        case DVD_LU_SEND_TITLE_KEY:
                cdinfo(CD_DVD, "entering DVD_LU_SEND_TITLE_KEY\n"); 
+               cgc.quiet = 1;
                setup_report_key(&cgc, ai->lstk.agid, 4);
                cgc.cmd[5] = ai->lstk.lba;
                cgc.cmd[4] = ai->lstk.lba >> 8;