diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2014-01-13 16:49:35 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-02-18 10:52:55 -0600 |
| commit | ea365922f9eb2fb6fc0486f521748f19bfd5c502 (patch) | |
| tree | d3eee34aa989a92453b15af6a3ec78d11f704738 /drivers/usb/gadget | |
| parent | de9db572fe5135bb2cf5bb2d8520f99a56b21d9b (diff) | |
| download | op-kernel-dev-ea365922f9eb2fb6fc0486f521748f19bfd5c502.zip op-kernel-dev-ea365922f9eb2fb6fc0486f521748f19bfd5c502.tar.gz | |
usb: gadget: FunctionFS: dereference ffs_dev conditionally
ffs_dev->ffs_release_dev_callback should be accessed only if ffs_dev
is not NULL.
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 306a2b5..78333f0 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -2590,11 +2590,12 @@ static void ffs_release_dev(struct ffs_data *ffs_data) ffs_dev_lock(); ffs_dev = ffs_data->private_data; - if (ffs_dev) + if (ffs_dev) { ffs_dev->mounted = false; - - if (ffs_dev->ffs_release_dev_callback) - ffs_dev->ffs_release_dev_callback(ffs_dev); + + if (ffs_dev->ffs_release_dev_callback) + ffs_dev->ffs_release_dev_callback(ffs_dev); + } ffs_dev_unlock(); } |
