From: Vijayavardhan Vennapusa <vvre...@codeaurora.org>

In case of poweroff charging mode, accessory function instance
is not created and due to this, _acc_dev will be NULL. If target
is connected to Accessory dock in poweroff charging mode, there
is a chance dev pointer is accessed, which is NULL. Hence add a
check before processing control request and return error if it is
NULL.

Signed-off-by: Vijayavardhan Vennapusa <vvre...@codeaurora.org>
Signed-off-by: Jack Pham <ja...@codeaurora.org>
Signed-off-by: rickyniu <ricky...@google.com>
---
 drivers/usb/gadget/function/f_accessory.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/gadget/function/f_accessory.c 
b/drivers/usb/gadget/function/f_accessory.c
index 514eadee1793..5ed80940b9bf 100644
--- a/drivers/usb/gadget/function/f_accessory.c
+++ b/drivers/usb/gadget/function/f_accessory.c
@@ -833,6 +833,12 @@ int acc_ctrlrequest(struct usb_composite_dev *cdev,
        u16     w_length = le16_to_cpu(ctrl->wLength);
        unsigned long flags;
 
+       /*
+        * If instance is not created which is the case in power off charging
+        * mode, dev will be NULL. Hence return error if it is the case.
+        */
+       if (!dev)
+               return -ENODEV;
 /*
        printk(KERN_INFO "acc_ctrlrequest "
                        "%02x.%02x v%04x i%04x l%u\n",
-- 
2.28.0.1011.ga647a8990f-goog

Reply via email to