From: Lu Baolu <baolu.lu@linux.intel.com>
To: Mathias Nyman <mathias.nyman@linux.intel.com>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
zhengjun.xing@linux.intel.com,
Lu Baolu <baolu.lu@linux.intel.com>,
Guoqing Zhang <guoqing.zhang@intel.com>
Subject: [PATCH v2 1/5] usb: xhci: Disable slot even virt-dev is null
Date: Thu, 27 Jul 2017 10:21:34 +0800 [thread overview]
Message-ID: <1501122098-10935-2-git-send-email-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <1501122098-10935-1-git-send-email-baolu.lu@linux.intel.com>
xhci_disable_slot() is a helper for disabling a slot when a device
goes away or recovers from error situations. Currently, it checks
the corespoding virt-dev pointer and returns directly (w/o issuing
disable slot command) if it's null.
This is unnecessary and will cause problems in case where virt-dev
allocation fails and xhci_disable_slot() is called to roll back the
hardware state. Refer to the implementation of xhci_alloc_dev().
This patch removes lines to check virt-dev in xhci_disable_slot().
Fixes: f9e609b82479 ("usb: xhci: Add helper function xhci_disable_slot().")
Cc: Guoqing Zhang <guoqing.zhang@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/usb/host/xhci.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index b2ff1ff..e69073f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3567,11 +3567,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, struct xhci_command *command,
unsigned long flags;
u32 state;
int ret = 0;
- struct xhci_virt_device *virt_dev;
- virt_dev = xhci->devs[slot_id];
- if (!virt_dev)
- return -EINVAL;
if (!command)
command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
if (!command)
--
2.7.4
next prev parent reply other threads:[~2017-07-27 2:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-27 2:21 [PATCH v2 0/5] usb: xhci: Handle USB transaction error on address command Lu Baolu
2017-07-27 2:21 ` Lu Baolu [this message]
2017-08-09 7:58 ` [PATCH v2 1/5] usb: xhci: Disable slot even virt-dev is null Mathias Nyman
2017-08-10 0:35 ` Lu Baolu
2017-08-10 10:00 ` Mathias Nyman
2017-08-11 1:18 ` Lu Baolu
2017-07-27 2:21 ` [PATCH v2 2/5] usb: xhci: Fix potential memory leak in xhci_disable_slot() Lu Baolu
2017-08-09 10:09 ` Mathias Nyman
2017-07-27 2:21 ` [PATCH v2 3/5] usb: xhci: Fix memory leak when xhci_disable_slot() returns error Lu Baolu
2017-07-27 2:21 ` [PATCH v2 4/5] usb: xhci: Return error when host is dead in xhci_disable_slot() Lu Baolu
2017-07-27 2:21 ` [PATCH v2 5/5] usb: xhci: Handle USB transaction error on address command Lu Baolu
2017-07-27 7:55 ` Felipe Balbi
2017-07-27 8:56 ` Lu Baolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1501122098-10935-2-git-send-email-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=guoqing.zhang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).