From 986aad56c1416ffcf738657e0dd0710b36254189 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 01:52:41 +0200
Subject: [PATCH] 	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer
 dereference.

---
 ChangeLog   | 4 ++++
 disk/scsi.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 835293aec..3fd31efaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
+
 2010-07-14  Anton Blanchard  <anton@samba.org>
 
 	* loader/powerpc/ieee1275/linux.c (grub_cmd_linux): Do not reject
diff --git a/disk/scsi.c b/disk/scsi.c
index 5f04d9ef7..60192bef5 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -402,7 +402,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
       if (p->open (bus, scsi))
 	continue;
 
-      disk->id = grub_make_scsi_id (scsi->dev->id, bus, lun);
+      disk->id = grub_make_scsi_id (p->id, bus, lun);
       disk->data = scsi;
       scsi->dev = p;
       scsi->lun = lun;