diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/scsi_ioctl.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index b98f763931c5..d9564fb04f62 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c | |||
| @@ -308,6 +308,9 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, | |||
| 308 | case SG_SCSI_RESET_DEVICE: | 308 | case SG_SCSI_RESET_DEVICE: |
| 309 | val = SCSI_TRY_RESET_DEVICE; | 309 | val = SCSI_TRY_RESET_DEVICE; |
| 310 | break; | 310 | break; |
| 311 | case SG_SCSI_RESET_TARGET: | ||
| 312 | val = SCSI_TRY_RESET_TARGET; | ||
| 313 | break; | ||
| 311 | case SG_SCSI_RESET_BUS: | 314 | case SG_SCSI_RESET_BUS: |
| 312 | val = SCSI_TRY_RESET_BUS; | 315 | val = SCSI_TRY_RESET_BUS; |
| 313 | break; | 316 | break; |