diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /drivers/cdrom/cdrom.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
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; |