diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-05-29 03:29:03 +0200 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-05-29 03:29:03 +0200 |
commit | 4fedb1f0959973738ef9ac7e52ea0c260f1a3302 (patch) | |
tree | 9efa44cf1595e4cc1c12830675a589161b588495 /Documentation | |
parent | Linux 6.10-rc1 (diff) | |
parent | scsi: core: Handle devices which return an unusually large VPD page count (diff) | |
download | linux-4fedb1f0959973738ef9ac7e52ea0c260f1a3302.tar.xz linux-4fedb1f0959973738ef9ac7e52ea0c260f1a3302.zip |
Merge branch '6.10/scsi-queue' into 6.10/scsi-fixes
Pull in remaining commits from 6.10/scsi-queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/cdrom/cdrom-standard.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cdrom/cdrom-standard.rst b/Documentation/cdrom/cdrom-standard.rst index 7964fe134277..6c1303cff159 100644 --- a/Documentation/cdrom/cdrom-standard.rst +++ b/Documentation/cdrom/cdrom-standard.rst @@ -217,7 +217,7 @@ current *struct* is:: int (*media_changed)(struct cdrom_device_info *, int); int (*tray_move)(struct cdrom_device_info *, int); int (*lock_door)(struct cdrom_device_info *, int); - int (*select_speed)(struct cdrom_device_info *, int); + int (*select_speed)(struct cdrom_device_info *, unsigned long); int (*get_last_session) (struct cdrom_device_info *, struct cdrom_multisession *); int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *); @@ -396,7 +396,7 @@ action need be taken, and the return value should be 0. :: - int select_speed(struct cdrom_device_info *cdi, int speed) + int select_speed(struct cdrom_device_info *cdi, unsigned long speed) Some CD-ROM drives are capable of changing their head-speed. There are several reasons for changing the speed of a CD-ROM drive. Badly |