diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-03 02:47:16 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-03 02:47:16 +0200 |
commit | b132e4a25dccf5d5857e6ce2d96541be51aa9c5e (patch) | |
tree | 64a6474bc7c218ff228469fda4600556217939b8 /drivers/nvme/target/loop.c | |
parent | usb: musb: dsps: keep VBUS on for host-only mode (diff) | |
parent | usb: gadget: udc: renesas_usb3: Fix PN_INT_ENA disabling timing (diff) | |
download | linux-b132e4a25dccf5d5857e6ce2d96541be51aa9c5e.tar.xz linux-b132e4a25dccf5d5857e6ce2d96541be51aa9c5e.zip |
Merge tag 'fixes-for-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.12-rc4
A fix to a really old synchronization bug on mass storage gadget.
Support for Meson8 SoCs on dwc2
Synchronization fixes on renesas USB driver.
Diffstat (limited to 'drivers/nvme/target/loop.c')
-rw-r--r-- | drivers/nvme/target/loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index feb497134aee..e503cfff0337 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -558,7 +558,7 @@ static int nvme_loop_reset_ctrl(struct nvme_ctrl *nctrl) static const struct nvme_ctrl_ops nvme_loop_ctrl_ops = { .name = "loop", .module = THIS_MODULE, - .is_fabrics = true, + .flags = NVME_F_FABRICS, .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, |