git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
include
/
scsi
/
scsi_device.h
diff --git
a/include/scsi/scsi_device.h
b/include/scsi/scsi_device.h
index
f171c65
..
2d3ec50
100644
(file)
--- a/
include/scsi/scsi_device.h
+++ b/
include/scsi/scsi_device.h
@@
-462,7
+462,7
@@
static inline int scsi_device_qas(struct scsi_device *sdev)
}
static inline int scsi_device_enclosure(struct scsi_device *sdev)
{
- return sdev->inquiry
[6] & (1<<6)
;
+ return sdev->inquiry
? (sdev->inquiry[6] & (1<<6)) : 1
;
}
static inline int scsi_device_protection(struct scsi_device *sdev)