diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/scsi/libsas/sas_expander.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index f3f693b772ac..874e29d9533f 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c | |||
| @@ -240,7 +240,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req, | |||
| 240 | disc_resp, DISCOVER_RESP_SIZE); | 240 | disc_resp, DISCOVER_RESP_SIZE); |
| 241 | if (res) | 241 | if (res) |
| 242 | return res; | 242 | return res; |
| 243 | /* This is detecting a failure to transmit inital | 243 | /* This is detecting a failure to transmit initial |
| 244 | * dev to host FIS as described in section G.5 of | 244 | * dev to host FIS as described in section G.5 of |
| 245 | * sas-2 r 04b */ | 245 | * sas-2 r 04b */ |
| 246 | dr = &((struct smp_resp *)disc_resp)->disc; | 246 | dr = &((struct smp_resp *)disc_resp)->disc; |