projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.samba.org/sfrench/cifs-2.6
[firefly-linux-kernel-4.4.55.git]
/
block
/
bsg.c
diff --git
a/block/bsg.c
b/block/bsg.c
index 9651ec7b87c22f1a14b9f5cbdad073006de222d1..4cf703fd98bb8916fe74ae3b42d4856958d57950 100644
(file)
--- a/
block/bsg.c
+++ b/
block/bsg.c
@@
-769,12
+769,10
@@
static struct bsg_device *bsg_add_device(struct inode *inode,
struct file *file)
{
struct bsg_device *bd;
struct file *file)
{
struct bsg_device *bd;
- int ret;
#ifdef BSG_DEBUG
unsigned char buf[32];
#endif
#ifdef BSG_DEBUG
unsigned char buf[32];
#endif
- ret = blk_get_queue(rq);
- if (ret)
+ if (!blk_get_queue(rq))
return ERR_PTR(-ENXIO);
bd = bsg_alloc_device();
return ERR_PTR(-ENXIO);
bd = bsg_alloc_device();