diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
| commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
| tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /drivers/scsi/libsas/sas_expander.c | |
| parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
| parent | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (diff) | |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index b3381959acce..33cf988c8c8a 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c | |||
| @@ -960,7 +960,6 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id) | |||
| 960 | 960 | ||
| 961 | } | 961 | } |
| 962 | } | 962 | } |
| 963 | res = 0; | ||
| 964 | } | 963 | } |
| 965 | 964 | ||
| 966 | return res; | 965 | return res; |