Merge mainline into usb

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-17 02:44:33 +02:00
commit b92c6ff67f
5 changed files with 48 additions and 5 deletions

View file

@ -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;