diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-11-18 23:46:03 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-18 23:46:03 +0100 |
| commit | a78b03bc7300e4f17b1e510884bea1095d92b17b (patch) | |
| tree | 855f219806462da09c8021b27848c58713bb1807 /drivers/scsi/ufs | |
| parent | floppy: remove now unused 'flags' variable (diff) | |
| parent | Linux 4.20-rc3 (diff) | |
| download | linux-a78b03bc7300e4f17b1e510884bea1095d92b17b.tar.xz linux-a78b03bc7300e4f17b1e510884bea1095d92b17b.zip | |
Merge tag 'v4.20-rc3' into for-4.21/block
Merge in -rc3 to resolve a few conflicts, but also to get a few
important fixes that have gone into mainline since the block
4.21 branch was forked off (most notably the SCSI queue issue,
which is both a conflict AND needed fix).
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/ufs')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index fb308ea8e9a5..27db55b0ca7f 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8099,7 +8099,6 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) err = -ENOMEM; goto out_error; } - hba = shost_priv(host); hba->host = host; hba->dev = dev; |