diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-29 16:58:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-29 16:58:47 +0100 |
| commit | 7557c1b3f715624f3bd4c809f03771ce9384eb7b (patch) | |
| tree | 4ea11f34ea4c4c35099fa420205dd18982c60666 /drivers/block | |
| parent | Merge tag 'pci-v5.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropri... (diff) | |
| download | linux-7557c1b3f715624f3bd4c809f03771ce9384eb7b.tar.xz linux-7557c1b3f715624f3bd4c809f03771ce9384eb7b.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Four small fixes.
Three are in drivers for fairly obvious bugs. The fourth is a set of
regressions introduced by the compat_ioctl changes because some of the
compat updates wrongly replaced .ioctl instead of .compat_ioctl"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropriate places
scsi: zfcp: fix wrong data and display format of SFP+ temperature
scsi: sd_sbc: Fix sd_zbc_report_zones()
scsi: libfc: free response frame from GPN_ID
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/paride/pcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index 117cfc8cd05a..cda5cf917e9a 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -276,7 +276,7 @@ static const struct block_device_operations pcd_bdops = { .release = pcd_block_release, .ioctl = pcd_block_ioctl, #ifdef CONFIG_COMPAT - .ioctl = blkdev_compat_ptr_ioctl, + .compat_ioctl = blkdev_compat_ptr_ioctl, #endif .check_events = pcd_block_check_events, }; |