SCSI - cache ID bug

diff --git a/ChangeLog b/ChangeLog
index 326ce1a4428e8038188bb1e77a929a886d201c3f..cc3c87445e351f4ffebd6f35b87208bd9056e9da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-02  Aleš Nesrsta <starous@volny.cz>
+
+       * include/grub/scsi.h:
+       SCSI -  cache ID bug
+
 2010-10-02  Aleš Nesrsta <starous@volny.cz>
 
        * grub-core/bus/usb/ohci.c, grub-core/bus/usb/uhci.c:

diff --git a/include/grub/scsi.h b/include/grub/scsi.h
index b3c60f3e818a139e7ba7d15363a370111108d960..b30d317c71c3b60868143276fa548ce5bcb9b0e0 100644 (file)
--- a/include/grub/scsi.h
+++ b/include/grub/scsi.h
@@ -40,7 +40,7 @@ static inline grub_uint32_t
 grub_make_scsi_id (int subsystem, int bus, int lun)
 {
   return (subsystem << GRUB_SCSI_ID_SUBSYSTEM_SHIFT)
-    | (bus << GRUB_SCSI_ID_BUS_SHIFT) | (lun << GRUB_SCSI_ID_BUS_SHIFT);
+    | (bus << GRUB_SCSI_ID_BUS_SHIFT) | (lun << GRUB_SCSI_ID_LUN_SHIFT);
 }
 
 struct grub_scsi_dev