diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-04-11 19:18:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-04-11 19:18:42 -0700 |
| commit | 2e8cbd520c96bb68b536073a187e90b866bcdf4c (patch) | |
| tree | 644e181abfee5aa2d0fd6fd0df24d670a25d3f43 | |
| parent | e718c5461b2daa19c7db12d6cf10d5cb63fe342f (diff) | |
| parent | 1b1943b755c46d696cd8faa7c7bda350495cce13 (diff) | |
Merge "USB: f_accessory: Check dev pointer before decoding ctrl request"
| -rw-r--r-- | drivers/usb/gadget/function/f_accessory.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c index a412f024d834..61dfceb336d6 100644 --- a/drivers/usb/gadget/function/f_accessory.c +++ b/drivers/usb/gadget/function/f_accessory.c @@ -887,6 +887,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", |