diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 01:18:36 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 01:18:36 -0400 |
| commit | 4783f393de3077211c14675a0e57c8a02e9190b0 (patch) | |
| tree | 6c37d8664eb072fd026db3706481d771da4495ca /drivers/block/pktcdvd.c | |
| parent | 9f5f9ffe50e90ed73040d2100db8bfc341cee352 (diff) | |
| parent | 5b8544c38e6fde6968645afd46ff681492192b86 (diff) | |
Merge remote branch 'kumar/merge' into next
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index b1cbeb59bb76..37a2bb595076 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -2369,7 +2369,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush) | |||
| 2369 | pkt_shrink_pktlist(pd); | 2369 | pkt_shrink_pktlist(pd); |
| 2370 | } | 2370 | } |
| 2371 | 2371 | ||
| 2372 | static struct pktcdvd_device *pkt_find_dev_from_minor(int dev_minor) | 2372 | static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor) |
| 2373 | { | 2373 | { |
| 2374 | if (dev_minor >= MAX_WRITERS) | 2374 | if (dev_minor >= MAX_WRITERS) |
| 2375 | return NULL; | 2375 | return NULL; |