Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4adea1fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "This is mostly stuff which missed the first pull request because it
  needed to incubate longer.  It's mainly made up of the ncr 5380 rework
  but also has a few assorted bug fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (88 commits)
  imm: Use new parport device model
  megaraid: Fix possible NULL pointer deference in mraid_mm_ioctl
  storvsc: Fix typo in MODULE_PARM_DESC
  cxgbi: Typo in MODULE_PARM_DESC
  3w-xxxx: Pass through compat mode ioctls
  hisi_sas: Use u64 for qw0 in free_device_v1_hw()
  hisi_sas: Fix typo in setup_itct_v1_hw()
  hisi_sas: Fix v1 itct masks
  ipr: Fix out-of-bounds null overwrite
  scsi: add Synology to 1024 sector blacklist
  ncr5380: Add support for HP C2502
  ncr5380: Fix wait for 53C80 registers registers after PDMA
  ncr5380: Enable PDMA for DTC chips
  ncr5380: Enable PDMA for NCR53C400A
  ncr5380: Use runtime register mapping
  ncr5380: Fix pseudo DMA transfers on 53C400
  ncr5380: Cleanup whitespace and parentheses
  atari_NCR5380: Merge changes from NCR5380.c
  ncr5380: Merge changes from atari_NCR5380.c
  ncr5380: Fix whitespace in comments using regexp
  ...
parents 2c9b3ebd 60539fa3

drivers/scsi/3w-xxxx.c

+3 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,9 @@ static int tw_chrdev_open(struct inode *inode, struct file *file) 
static const struct file_operations tw_fops = {

	.owner		= THIS_MODULE,

	.unlocked_ioctl	= tw_chrdev_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl   = tw_chrdev_ioctl,

#endif

	.open		= tw_chrdev_open,

	.release	= NULL,

	.llseek		= noop_llseek,

drivers/scsi/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -1620,23 +1620,6 @@ config ATARI_SCSI 
	  ST-DMA, replacing ACSI).  It does NOT support other schemes, like

	  in the Hades (without DMA).



config ATARI_SCSI_TOSHIBA_DELAY

	bool "Long delays for Toshiba CD-ROMs"

	depends on ATARI_SCSI

	help

	  This option increases the delay after a SCSI arbitration to

	  accommodate some flaky Toshiba CD-ROM drives. Say Y if you intend to

	  use a Toshiba CD-ROM drive; otherwise, the option is not needed and

	  would impact performance a bit, so say N.



config ATARI_SCSI_RESET_BOOT

	bool "Reset SCSI-devices at boottime"

	depends on ATARI_SCSI

	help

	  Reset the devices on your Atari whenever it boots.  This makes the

	  boot process fractionally longer but may assist recovery from errors

	  that leave the devices with SCSI operations partway completed.



config MAC_SCSI

	tristate "Macintosh NCR5380 SCSI"

	depends on MAC && SCSI=y