Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / ppa.c

diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index fafcf5d185e761d43b0fe949be06e2d4f5a3898f..05347eed9dd5d1edfe2ea9fb3b251da770c299f1 100644 (file)
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -740,7 +740,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)
                }
 
        case 2:         /* Phase 2 - We are now talking to the scsi bus */
-               if (!ppa_select(dev, cmd->device->id)) {
+               if (!ppa_select(dev, scmd_id(cmd))) {
                        ppa_fail(dev, DID_NO_CONNECT);
                        return 0;
                }