diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-09 12:42:41 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-09 12:42:41 -0800 |
| commit | a6d83d2e8ed916c5a097c7c047dc39cb9183b0e9 (patch) | |
| tree | 900f28d22acc44eeed7e4f171fa6b1ddd286fd58 | |
| parent | f272bb9cd5abeb970e12582c34dc3808ea982b17 (diff) | |
| parent | 99392dcd7d673f673d08c6eaaac00a05d6ac9300 (diff) | |
Merge "usb: gadget: Fix null pointer crash issue in gsi_free_inst"
| -rw-r--r-- | drivers/usb/gadget/function/f_gsi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/function/f_gsi.c b/drivers/usb/gadget/function/f_gsi.c index 47e077d180ec..b3d223a76f07 100644 --- a/drivers/usb/gadget/function/f_gsi.c +++ b/drivers/usb/gadget/function/f_gsi.c @@ -3007,6 +3007,9 @@ static void gsi_free_inst(struct usb_function_instance *f) { struct gsi_opts *opts = container_of(f, struct gsi_opts, func_inst); + if (!opts->gsi) + return; + if (opts->gsi->c_port.ctrl_device.fops) misc_deregister(&opts->gsi->c_port.ctrl_device); |