diff options
| author | mav <mav@FreeBSD.org> | 2015-03-12 13:40:02 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-03-12 13:40:02 +0000 |
| commit | 24b691f7111d3c0dcbe192f203a94b883de680de (patch) | |
| tree | d3c5c93b95f0efbd6bf01ff27f0e3976e7d9f3c6 /sys/dev/ahci/ahciem.c | |
| parent | 19c51041e76489eebb60a5f32f2cbab750826a8c (diff) | |
| download | FreeBSD-src-24b691f7111d3c0dcbe192f203a94b883de680de.zip FreeBSD-src-24b691f7111d3c0dcbe192f203a94b883de680de.tar.gz | |
MFC r271146,271201,271207,271261,271457,272606,277100,277126,278034,279320,
279573: Sync AHCI driver with HEAD.
Due to code reorganization in r271146 and many previous reordered merges it
is problematic to merge those revisions separately.
Diffstat (limited to 'sys/dev/ahci/ahciem.c')
| -rw-r--r-- | sys/dev/ahci/ahciem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c index 6871468..049b7c8 100644 --- a/sys/dev/ahci/ahciem.c +++ b/sys/dev/ahci/ahciem.c @@ -344,7 +344,7 @@ ahci_em_led(void *priv, int onoff) } static int -ahci_check_ids(device_t dev, union ccb *ccb) +ahci_check_ids(union ccb *ccb) { if (ccb->ccb_h.target_id != 0) { @@ -554,7 +554,7 @@ ahciemaction(struct cam_sim *sim, union ccb *ccb) dev = enc->dev; switch (ccb->ccb_h.func_code) { case XPT_ATA_IO: /* Execute the requested I/O operation */ - if (ahci_check_ids(dev, ccb)) + if (ahci_check_ids(ccb)) return; ahci_em_begin_transaction(dev, ccb); return; |
