diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 13:20:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 13:20:07 -0400 |
| commit | d67e91117d104d98635e1b1623aafb26604cecbb (patch) | |
| tree | a328b623ed07a33c1322ebc234e3236aa326494b /drivers/scsi/sd.c | |
| parent | 00c04db982b66fe9e8c8c5156808b905199bd645 (diff) | |
| parent | 28aef2f7d9415b881c9145ab9b2c1c234064a243 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] a100u2w: fix bitmap lookup routine
[SCSI] fix media change events for polled devices
[SCSI] sd, sr: do not emit change event at device add
[SCSI] mpt fusion: Power Management fixes for MPT SAS PCI-E controllers
[SCSI] gdth: Allocate sense_buffer to prevent NULL pointer dereference
[SCSI] arcmsr: fix iounmap error for Type B adapter
[SCSI] isd200: Allocate sense_buffer for hacked up scsi_cmnd
[SCSI] fix bsg queue oops with iscsi logout
[SCSI] Fix dependency problems in SCSI drivers
[SCSI] advansys: Fix bug in AdvLoadMicrocode
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7aee64dbfbeb..5fe7aaed904c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1654,6 +1654,7 @@ static int sd_probe(struct device *dev) | |||
| 1654 | sdkp->disk = gd; | 1654 | sdkp->disk = gd; |
| 1655 | sdkp->index = index; | 1655 | sdkp->index = index; |
| 1656 | sdkp->openers = 0; | 1656 | sdkp->openers = 0; |
| 1657 | sdkp->previous_state = 1; | ||
| 1657 | 1658 | ||
| 1658 | if (!sdp->timeout) { | 1659 | if (!sdp->timeout) { |
| 1659 | if (sdp->type != TYPE_MOD) | 1660 | if (sdp->type != TYPE_MOD) |