diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 19:53:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 19:53:30 -0700 |
| commit | f164c42161d21368d9cd4d6d6efc158baa2618db (patch) | |
| tree | fd6b2043f847b3551b1a8e13ef6fedd8ff575bad /drivers/scsi/megaraid.c | |
| parent | 6973dddee264723720e18ad2be5a0a454c0f52d9 (diff) | |
| parent | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (diff) | |
| download | linux-next-f164c42161d21368d9cd4d6d6efc158baa2618db.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
[SCSI] SPI transport class: misc DV fixes
[SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
[SCSI] eata_pio cleanup and PCI fix
[SCSI] aacraid: README update
[SCSI] aacraid: remove scsi_remove_device
[SCSI] aacraid: merge rx and rkt code
[SCSI] aacraid: expose physical devices
[SCSI] aacraid: misc cleanup
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
[SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
[SCSI] zfcp: fix: use correct req_id in eh_abort_handler
[SCSI] zfcp: create private slab caches to guarantee proper data alignment
[SCSI] zfcp: remove zfcp_ccw_unregister function
[SCSI] aic7xxx: pause sequencer before touching SBLKCTL
[SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
[SCSI] scsi_debug version 1.80
[SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
[SCSI] aha152x: remove static host array
...
Diffstat (limited to 'drivers/scsi/megaraid.c')
| -rw-r--r-- | drivers/scsi/megaraid.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 76edbb639d37..b87bef69ba0f 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -2822,9 +2822,7 @@ mega_print_inquiry(char *page, char *scsi_inq) i = scsi_inq[0] & 0x1f; - len += sprintf(page+len, " Type: %s ", - i < MAX_SCSI_DEVICE_CODE ? scsi_device_types[i] : - "Unknown "); + len += sprintf(page+len, " Type: %s ", scsi_device_type(i)); len += sprintf(page+len, " ANSI SCSI revision: %02x", scsi_inq[2] & 0x07); @@ -3658,8 +3656,9 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, * Send the request sense data also, irrespective of * whether the user has asked for it or not. */ - copy_to_user(upthru->reqsensearea, - pthru->reqsensearea, 14); + if (copy_to_user(upthru->reqsensearea, + pthru->reqsensearea, 14)) + rval = -EFAULT; freemem_and_return: if( pthru->dataxferlen ) { |