diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 17:23:52 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 17:23:52 +0100 |
| commit | 1bc38a1d33a09949cfb6a12349e3c8dac867a5ab (patch) | |
| tree | e3fa41f522857e3416854368b59e2e08c571f55d /drivers/target/target_core_spc.c | |
| parent | ddf2965d77558eefee745c9dce22ad7ef5c7b88e (diff) | |
| parent | a92444c6b2225a9115d661c950cb48a22aeace20 (diff) | |
| download | linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.tar.gz linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.tar.bz2 linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.zip | |
Merge branch 'irq/for-arm' into irq/core
Pull the functionality which is required to cleanup sdhci/sdio
in. It's in a separate branch so it can be pulled from others
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/target/target_core_spc.c')
| -rw-r--r-- | drivers/target/target_core_spc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c index 43c5ca9878bc..3bebc71ea033 100644 --- a/drivers/target/target_core_spc.c +++ b/drivers/target/target_core_spc.c @@ -440,8 +440,8 @@ check_scsi_name: padding = ((-scsi_target_len) & 3); if (padding) scsi_target_len += padding; - if (scsi_name_len > 256) - scsi_name_len = 256; + if (scsi_target_len > 256) + scsi_target_len = 256; buf[off-1] = scsi_target_len; off += scsi_target_len; |