summaryrefslogtreecommitdiff
path: root/drivers/block/ataflop.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-02-24 23:17:07 +0300
committerBen Skeggs <bskeggs@redhat.com>2011-02-24 23:17:07 +0300
commite11d57ca0b6dada29007ce3ad3db6c84034a768f (patch)
tree39ad0c208e2cb3da79f958bd0e9d0d12b8e5f8fe /drivers/block/ataflop.c
parent317495b25ec1f0beb0dbac8ee0dfec59a1addf03 (diff)
parenta2c06ee2fe5b48a71e697bae00c6e7195fc016b6 (diff)
downloadlinux-e11d57ca0b6dada29007ce3ad3db6c84034a768f.tar.xz
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
Diffstat (limited to 'drivers/block/ataflop.c')
-rw-r--r--drivers/block/ataflop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 4e4cc6c828cb..605a67e40bbf 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1399,7 +1399,7 @@ static struct request *set_next_request(void)
{
struct request_queue *q;
int old_pos = fdc_queue;
- struct request *rq;
+ struct request *rq = NULL;
do {
q = unit[fdc_queue].disk->queue;