From 61df8c64c87f7a09d9221759141d11d08bac165e Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Mon, 29 Oct 2007 17:18:39 -0400 Subject: [PATCH] --- yaml --- r: 73111 b: refs/heads/master c: f26792d5c63344e14540ced4b19deb29e360bb8d h: refs/heads/master i: 73109: 47ea307f04ae98f636e69e9f7432337e5235c88a 73107: 52b21dced3697b2212b83b4b4a818d4210d6ffc0 73103: b01efec403768e5dedaeaf4921a8aca486fc3ef0 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2d5e25c3cd07..b1400e7d6126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a341cd0f6a0fde1f85fec9aa8f81f824ea4a3f92 +refs/heads/master: f26792d5c63344e14540ced4b19deb29e360bb8d diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index 245057df69d6..94144ed50a6b 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -841,6 +841,9 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, blk_queue_max_hw_segments(q, q->max_hw_segments - 1); } + if (dev->flags & ATA_DFLAG_AN) + set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); + if (dev->flags & ATA_DFLAG_NCQ) { int depth; @@ -3296,10 +3299,9 @@ static void ata_scsi_handle_link_detach(struct ata_link *link) */ void ata_scsi_media_change_notify(struct ata_device *dev) { -#ifdef OTHER_AN_PATCHES_HAVE_BEEN_APPLIED if (dev->sdev) - scsi_device_event_notify(dev->sdev, SDEV_MEDIA_CHANGE); -#endif + sdev_evt_send_simple(dev->sdev, SDEV_EVT_MEDIA_CHANGE, + GFP_ATOMIC); } /**