diff options
author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/cdrom/cdrom.c | |
parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'merge'
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r-- | drivers/cdrom/cdrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index ca27ee89240b..d239cf8b20bd 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
@@ -1837,7 +1837,7 @@ static int dvd_read_bca(struct cdrom_device_info *cdi, dvd_struct *s) | |||
1837 | init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ); | 1837 | init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ); |
1838 | cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; | 1838 | cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; |
1839 | cgc.cmd[7] = s->type; | 1839 | cgc.cmd[7] = s->type; |
1840 | cgc.cmd[9] = cgc.buflen = 0xff; | 1840 | cgc.cmd[9] = cgc.buflen & 0xff; |
1841 | 1841 | ||
1842 | if ((ret = cdo->generic_packet(cdi, &cgc))) | 1842 | if ((ret = cdo->generic_packet(cdi, &cgc))) |
1843 | return ret; | 1843 | return ret; |