patch-2.0.37 linux/drivers/cdrom/sbpcd.c
Next file: linux/drivers/char/Config.in
Previous file: linux/drivers/block/triton.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
Sun Jun 13 10:21:00 1999
- Orig file:
v2.0.36/linux/drivers/cdrom/sbpcd.c
- Orig date:
Mon Sep 2 05:18:26 1996
diff -u --recursive --new-file v2.0.36/linux/drivers/cdrom/sbpcd.c linux/drivers/cdrom/sbpcd.c
@@ -4911,14 +4911,16 @@
msg(DBG_000, "sbp_data: beginning to read.\n");
p = D_S[d].sbp_buf + frame * CD_FRAMESIZE;
if (sbpro_type==1) OUT(CDo_sel_i_d,1);
- if (cmd_type==READ_M2)
+ if (cmd_type==READ_M2) {
if (do_16bit) insw(CDi_data, xa_head_buf, CD_XA_HEAD>>1);
else insb(CDi_data, xa_head_buf, CD_XA_HEAD);
+ }
if (do_16bit) insw(CDi_data, p, CD_FRAMESIZE>>1);
else insb(CDi_data, p, CD_FRAMESIZE);
- if (cmd_type==READ_M2)
+ if (cmd_type==READ_M2) {
if (do_16bit) insw(CDi_data, xa_tail_buf, CD_XA_TAIL>>1);
else insb(CDi_data, xa_tail_buf, CD_XA_TAIL);
+ }
D_S[d].sbp_current++;
if (sbpro_type==1) OUT(CDo_sel_i_d,0);
if (cmd_type==READ_M2)
@@ -5502,9 +5504,10 @@
cc_ReadStatus();
i=ResponseStatus(); /* returns orig. status or p_busy_new */
if (famT_drive) i=ResponseStatus(); /* returns orig. status or p_busy_new */
- if (i<0)
+ if (i<0) {
if (i!=-402)
msg(DBG_INF,"init: ResponseStatus returns %d.\n",i);
+ }
else
{
if (st_check)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov