diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-28 14:40:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-28 14:40:49 -0400 |
| commit | 6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db (patch) | |
| tree | 8faea23112a11f52524eb413f71b7b02712d8b53 /drivers/block/cciss_scsi.c | |
| parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
| parent | 6672d90fe779dc0dfffe027c3ede12609df091c2 (diff) | |
| download | linux-6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/l2tp/l2tp_netlink.c
The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.
qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.
With help from Antonio Quartulli.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/block/cciss_scsi.c')
| -rw-r--r-- | drivers/block/cciss_scsi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 38aa6dda6b81..da3311129a0c 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c @@ -795,6 +795,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, } break; case CMD_PROTOCOL_ERR: + cmd->result = DID_ERROR << 16; dev_warn(&h->pdev->dev, "%p has protocol error\n", c); break; |