diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
| commit | 43a3beb6da994549ec28a9f31727b997a025f958 (patch) | |
| tree | 9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 /drivers/staging/keucr/scsiglue.c | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
| parent | 68cf162a1af23c35db8e3b78659c99196c9882ff (diff) | |
| download | op-kernel-dev-43a3beb6da994549ec28a9f31727b997a025f958.zip op-kernel-dev-43a3beb6da994549ec28a9f31727b997a025f958.tar.gz | |
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/keucr/scsiglue.c')
| -rw-r--r-- | drivers/staging/keucr/scsiglue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/keucr/scsiglue.c b/drivers/staging/keucr/scsiglue.c index 135f7f2..e1f3931 100644 --- a/drivers/staging/keucr/scsiglue.c +++ b/drivers/staging/keucr/scsiglue.c @@ -144,7 +144,7 @@ static int command_abort(struct scsi_cmnd *srb) scsi_lock(us_to_host(us)); if (us->srb != srb) { scsi_unlock(us_to_host(us)); - printk ("-- nothing to abort\n"); + printk("-- nothing to abort\n"); return FAILED; } @@ -279,7 +279,8 @@ static int proc_info(struct Scsi_Host *host, char *buffer, char **start, pos += sprintf(pos, " Quirks:"); #define US_FLAG(name, value) \ - if (us->fflags & value) pos += sprintf(pos, " " #name); + if (us->fflags & value)\ + pos += sprintf(pos, " " #name); US_DO_ALL_FLAGS #undef US_FLAG |
