diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-30 13:04:23 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-30 13:04:56 -0500 |
| commit | 3e93093ecd0c144e86a86cc1f165221b6cd3e7fb (patch) | |
| tree | 0d6dffb90985bd90fd0ca43076a629f12e277096 /drivers/target/target_core_pr.c | |
| parent | 43243322139194c2fea606095f82498e07536c27 (diff) | |
| parent | da660b4a3b15caea9c198c4f26d1cf7023df92fc (diff) | |
Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
From Pawel Moll:
Versatile Express related driver updates for 3.9:
* Move sp810 header to a more generic location,
mainly to share it with arm64
* tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux:
arm: Move sp810.h to include/linux/amba/
+ Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/target/target_core_pr.c')
| -rw-r--r-- | drivers/target/target_core_pr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index e35dbf85841f..8e0290b38e43 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c | |||
| @@ -2053,7 +2053,7 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key, | |||
| 2053 | /* Used for APTPL metadata w/ UNREGISTER */ | 2053 | /* Used for APTPL metadata w/ UNREGISTER */ |
| 2054 | unsigned char *pr_aptpl_buf = NULL; | 2054 | unsigned char *pr_aptpl_buf = NULL; |
| 2055 | unsigned char isid_buf[PR_REG_ISID_LEN], *isid_ptr = NULL; | 2055 | unsigned char isid_buf[PR_REG_ISID_LEN], *isid_ptr = NULL; |
| 2056 | sense_reason_t ret; | 2056 | sense_reason_t ret = TCM_NO_SENSE; |
| 2057 | int pr_holder = 0, type; | 2057 | int pr_holder = 0, type; |
| 2058 | 2058 | ||
| 2059 | if (!se_sess || !se_lun) { | 2059 | if (!se_sess || !se_lun) { |