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 tag 'v3.5-rc7' into late/soc
[firefly-linux-kernel-4.4.55.git]
/
include
/
scsi
/
scsi_cmnd.h
diff --git
a/include/scsi/scsi_cmnd.h
b/include/scsi/scsi_cmnd.h
index 1e1198546c725d43a7ff6baa657c25ef364d73ee..ac06cc595890ef87a8e01632f5872ab11e4057f2 100644
(file)
--- a/
include/scsi/scsi_cmnd.h
+++ b/
include/scsi/scsi_cmnd.h
@@
-134,10
+134,16
@@
struct scsi_cmnd {
static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
{
static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
{
+ struct scsi_driver **sdp;
+
if (!cmd->request->rq_disk)
return NULL;
if (!cmd->request->rq_disk)
return NULL;
- return *(struct scsi_driver **)cmd->request->rq_disk->private_data;
+ sdp = (struct scsi_driver **)cmd->request->rq_disk->private_data;
+ if (!sdp)
+ return NULL;
+
+ return *sdp;
}
extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
}
extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);