diff --git a/[refs] b/[refs] index 373935fef33e..7ea3be1d4588 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 463b8977ecebf8cf590c33191d43ea0b059381c6 +refs/heads/master: d1e12de804f9d8ad114786ca7c2ce593cba79891 diff --git a/trunk/include/scsi/scsi_device.h b/trunk/include/scsi/scsi_device.h index f171c65dc5a8..2d3ec5094685 100644 --- a/trunk/include/scsi/scsi_device.h +++ b/trunk/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)