← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/scsi/scsi_sysfs.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/scsi/scsi_sysfs.c
322
322
                kfree(evt);
323
323
        }
324
324
 
325
 
        if (sdev->request_queue) {
326
 
                sdev->request_queue->queuedata = NULL;
327
 
                /* user context needed to free queue */
328
 
                scsi_free_queue(sdev->request_queue);
329
 
                /* temporary expedient, try to catch use of queue lock
330
 
                 * after free of sdev */
331
 
                sdev->request_queue = NULL;
332
 
        }
 
325
        blk_put_queue(sdev->request_queue);
 
326
        /* NULL queue means the device can't be used */
 
327
        sdev->request_queue = NULL;
333
328
 
334
329
        scsi_target_reap(scsi_target(sdev));
335
330
 
383
378
        .name           = "scsi",
384
379
        .match          = scsi_bus_match,
385
380
        .uevent         = scsi_bus_uevent,
386
 
#ifdef CONFIG_PM_OPS
 
381
#ifdef CONFIG_PM
387
382
        .pm             = &scsi_bus_pm_ops,
388
383
#endif
389
384
};
937
932
        if (sdev->host->hostt->slave_destroy)
938
933
                sdev->host->hostt->slave_destroy(sdev);
939
934
        transport_destroy_device(dev);
 
935
 
 
936
        /* cause the request function to reject all I/O requests */
 
937
        sdev->request_queue->queuedata = NULL;
 
938
 
 
939
        /* Freeing the queue signals to block that we're done */
 
940
        scsi_free_queue(sdev->request_queue);
940
941
        put_device(dev);
941
942
}
942
943