projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6
[powerpc.git]
/
drivers
/
scsi
/
ppa.c
diff --git
a/drivers/scsi/ppa.c
b/drivers/scsi/ppa.c
index
fafcf5d
..
fee843f
100644
(file)
--- a/
drivers/scsi/ppa.c
+++ b/
drivers/scsi/ppa.c
@@
-18,6
+18,7
@@
#include <linux/parport.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
#include <linux/parport.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
+#include <linux/jiffies.h>
#include <asm/io.h>
#include <scsi/scsi.h>
#include <asm/io.h>
#include <scsi/scsi.h>
@@
-726,7
+727,7
@@
static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)
retv--;
if (retv) {
retv--;
if (retv) {
- if (
(jiffies - dev->jstart) > (1 * HZ
)) {
+ if (
time_after(jiffies, dev->jstart + (1 * HZ)
)) {
printk
("ppa: Parallel port cable is unplugged!!\n");
ppa_fail(dev, DID_BUS_BUSY);
printk
("ppa: Parallel port cable is unplugged!!\n");
ppa_fail(dev, DID_BUS_BUSY);
@@
-740,7
+741,7
@@
static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)
}
case 2: /* Phase 2 - We are now talking to the scsi bus */
}
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;
}
ppa_fail(dev, DID_NO_CONNECT);
return 0;
}