diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/scsi/sr.c | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 208565bdbe8e..7ee86d4a7618 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -623,6 +623,7 @@ static int sr_probe(struct device *dev) | |||
| 623 | cd->disk = disk; | 623 | cd->disk = disk; |
| 624 | cd->capacity = 0x1fffff; | 624 | cd->capacity = 0x1fffff; |
| 625 | cd->device->changed = 1; /* force recheck CD type */ | 625 | cd->device->changed = 1; /* force recheck CD type */ |
| 626 | cd->previous_state = 1; | ||
| 626 | cd->use = 1; | 627 | cd->use = 1; |
| 627 | cd->readcd_known = 0; | 628 | cd->readcd_known = 0; |
| 628 | cd->readcd_cdda = 0; | 629 | cd->readcd_cdda = 0; |